Merge branch 'master' into 'master'

Marius Cramer

2015-10-22 796661c563939605d8c7ba7e01b7ecf62f9cd1cf

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