Merge branch 'master' into 'master'

Marius Burkard

2015-12-23 6a00b4e599f724cbc9a12927c8a0446ef5621028

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