WIP
Merge branch 'master' into user_image
user can now add image on profile page
Merge branch 'master' into user_image
moved gem cucumber-rails to group:test, added :require => false