updated files
updated login
Merge branch 'feature/intern' of https://github.com/jonniespratley/angular-cms into feature/intern