Add profiles model and resources
Merge branch 'master' of github.com:upptalk/uppsell
Migration clash