Merge branch 'dev'
Merge branch 'master' of heroku.com:hotlynx