Merge branch 'dev'
Update procfile to work with Play 2.2 and heroku
Merge branch 'dev01'
Update app name in Procfile
Update Procfile name
remove test changes
Merge branch 'master' into dev