Merge remote-tracking branch 'sebj/master' and tidied up merged code

Marius Cramer

2013-11-18 015dffdc589b396d72092583cc526674f0a9a8d5

1
ALTER TABLE `client` CHANGE `company_id` `company_id` VARCHAR( 255 ) NULL DEFAULT NULL ;