Merge branch 'master' into 'master'

Marius Cramer

2015-01-30 accfcafdae46cfc1cc5567ee111c63dc223b6c8e

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