Merge branch 'master' of github.com:clearos/framework into cos7
Merge branch 'cos7' of github.com:clearos/framework into cos7
Merge branch 'cos7' of github.com:clearos/framework into cos7