Moved some functions from framework
Merge branch 'master' of github.com:clearos/app-marketplace