fixed added if statement to current user in application controller
Merge pull request #99 from simensta/model-item-testing-

fixed added if statement to current user in application controller
Merge pull request #101 from simensta/user-model-tests

User model tests
user tests refactored