Merge branch 'master' into 'master'

Marius Burkard

2015-11-26 add7cc461c0729819c73b2bf44076037a1592517

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