Merge branch 'master' of github.com:clearos/app-base into cos7
Moved login form to theme
Merge branch 'cos7' of github.com:clearos/app-base into cos7