Merge pull request #54 from worldintime/fix_facebook_login_bug

Fix facebook login bug
Merge pull request #56 from worldintime/set_up_paperclip

Set up paperclip to crop avatar to center square
Merge branch 'master' of github.com:worldintime/IceBreakerTest into hot_fix_for_upload_avatar
add blocked status and minutes for timer
Merge branch 'hot_fix_for_upload_avatar' into staging
merge with hot fix for upload avatar