Merge branch 'master' into 'master'

Marius Burkard

2015-12-23 4100550ca57282b76338ed3d16993189d7302037

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