Merge branch 'master' into 'master'

Marius Cramer

2015-06-29 7bcf62fc4e4b119c68998e2570005695eb5778f8

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