Merge branch 'master' into 'master'

Marius Burkard

2015-12-31 238326c6e7528571d0e8c68f310591206256ea77

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