Icon stuff

icon stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/scripts/gameengine.js
Merge branch 'master' of https://github.com/Tukajo/scootlife