Merge branch 'master' into 'master'

Falko Timme

2014-12-13 62fd31b9f97bc43dff837dcf525798153bfa2c98

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