Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-07-08 341ef7175af7c8f21d27262b58da8f5bc2c06ef0

 install/sql/incremental/upd_0011.sql

New file
@@ -0,0 +1,2 @@
-- use text for groups
ALTER TABLE `sys_user` CHANGE `groups` `groups` TEXT;