use heroku from now on
fix skin picture thingy
Merge branch 'dev' with changes to use heroku