Micro edit, more changes later
Merge branch 'master' into main-menu-page
Add spec for viewing main page

* also added helper login_as in authentication.rb