complete integration tests for user authentication
Merge branch 'master' into integration-test

merge master into integration-test feature branch
Merge pull request #5 from alexdinnel/integration-test

Integration test