added user account creation and authentication
Merge branch 'master' into HEAD
changing user model to use email as username
merging master into feature branch
merging authentication into master