Merge branch 'dashboard'
Merge branch 'master' of heroku.com:fangate2