Prepare for heroku
Merge branch 'master' of https://github.com/zpap/SevenHeaven