AccountController tests completed
committing merge with master
Merge pull request #5 from bgoerdt/user_login_branch

User login branch merged with master