Merge branch 'master' into 'master'

Marius Burkard

2015-12-08 10e9f75e0948d9dd72a4431c67292a05d582483c

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