Merge remote-tracking branch 'origin/email_confirmation_design'
Merge pull request #35 from worldintime/test_coverage

All tests are green
Merge pull request #36 from worldintime/unread_messages_fix

Unread messages fix
Merge pull request #37 from worldintime/email_confirmation_design

fix views
Remove OAuth, move FactoryGirl, set versions
Merge branch 'fix_gemfile' into staging

* fix_gemfile:
  Remove OAuth, move FactoryGirl, set versions