Merge branch 'master' into 'master'

Marius Cramer

2015-07-20 1f50209744f36c1602b11a3787dacfd3ea76527e

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