Merge branch 'develop' into 'master'

Falko Timme

2014-12-13 39fab06dfae1e0218a1bb3aa48a381586dfaea6d

1
ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm';