Upgrades!
Merge branch '8-2014-template' into gh-pages

Conflicts:
	scripts/game.js
Delete old file
Preload state added