Merge branch 'master' into 'master'

Marius Cramer

2015-10-23 831dd0a0f913fced0cb0df645cfe0348170798d0

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