MERGE 1-2 and main branches

MERGE 1-2 and main branches
Still a few diffs :
311,320c311,312
<   categoryname text,
<   codedescription text,
<   PRIMARY KEY (categorycode)
< );
<
< # Table structure for table 'branchrelations'
< #
< CREATE TABLE branchrelations (
<   branchcode varchar(4) DEFAULT '' NOT NULL,
<   categorycode varchar(4) DEFAULT '' NOT NULL
---
>   branchcode char(4) DEFAULT '' NOT NULL,
>   branchholding int(11)
344c336
<   datesent datetime DEFAULT '0000-00-00' NOT NULL,
---
>   datesent date DEFAULT '0000-00-00' NOT NULL,
346c338
<   datearrived datetime,
---
>   datearrived date,
553a546
>