bugfix on appdesk: the columns key of i18n was processed
Merge branch 'master/chiba' of github.com:novius-os/core into master/chiba
Merge branch 'master/chiba' of git://github.com/novius-os/core into master/chiba
Merge branch 'master/chiba' into master/chiba2