Added profile related stuff
Merge branch 'master' into heroku