Merge branch 'iba_57_remove_password_validation_on_edit' into staging
Merge pull request #45 from worldintime/fix_canned_statements

Canned statements are independent of Users
Merge branch 'staging' of github.com:worldintime/IceBreakerTest into staging
remove duplicated method for forgot password
Merge branch 'iba_24_forgot_password_fix' into staging