Merge pull request #40 from worldintime/fix_gemfile

Remove OAuth, move FactoryGirl, set versions
Merge remote-tracking branch 'origin/fix_ignore_user_bug'
Merge branch 'master' of github.com:worldintime/IceBreakerTest
Remove unnecessary migration
Merge pull request #43 from worldintime/remove_unnecessary_migration

Remove unnecessary migration
remove password validation on edit
Merge pull request #44 from worldintime/iba_57_remove_password_validation_on_edit

remove password validation on edit
Canned statements are independent of Users
Merge branch 'fix_canned_statements' into staging

* fix_canned_statements:
  Canned statements are independent of Users
  remove password validation on edit
  Remove unnecessary migration