Merge branch 'develop' into 'master'

Falko Timme

2014-12-13 39fab06dfae1e0218a1bb3aa48a381586dfaea6d

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