Moved simple_form gem in Gemfile
Grammar fixes
Merge branch 'master' into dev
used before_filter for profile
Merge branch 'dev'