Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-14 466f06a5845e57661092392055999cc0895af5f8

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