Merge branch 'dev'
Merge branch 'master' of https://github.com/yupe/yupe
now we can disable url rules from userspace configs
small fix in image module
fix translations
Merge branch 'dev' of https://github.com/yupe/yupe into dev