Prepped for build
Merge branch 'master' of github.com:clearos/framework