Merge branch 'master' into 'master'

Marius Cramer

2015-02-15 427cd2f62e87fc13fee43ecf764418c7ca5ae520

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