Merge branch 'master' into 'master'

Marius Cramer

2015-11-14 b717d292577f33f2e2ca044da469d8663aa982f6

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