Merge branch 'release-1.2'
Merge branch 'hotfix-1.1.3'
Merge branch 'master' of heroku.com:knightstick-drumbeat
Merge branch 'release-2.0'
Edit migrations
change profile layout
Move profile title
Resource routes
Add tests
Merge branch 'tests' into develop
Remove broken JS