pre merge
working edit profile
Merge branch 'master' of https://github.com/katke/farmar-rails