fix on appdesk
Merge branch 'master/chiba' into rel/chiba2
Merge branch 'rel/chiba2' of git://github.com/novius-os/core into rel/chiba2