tests user controller - all passing
Merge branch 'master' into testing_like_crazy
Merge pull request #42 from nullet/testing_like_crazy

Testing like crazy