Merge branch 'master' into 'master'

Marius Cramer

2015-07-30 a014597671651cdc10f88a2816ea39b9f1451666

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;