Merge branch 'master' into 'master'

Marius Cramer

2015-02-16 14f5a343328f7db49008255211af7cf08342a83c

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