Merge branch 'master' into 'master'

Marius Cramer

2015-05-22 8684fba8e8b3557a0ee2eee26a128e13e731c7e6

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