Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-13 43418672d32ee65ee6060314d4e66c3c44a8b0cb

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