Merge branch 'master' into 'master'

Marius Cramer

2015-04-27 13a336cf2c48089c3235a878e299c5244cc48aa9

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