astar stuff
Merge branch 'master' of github.com:Nikku/invisibleTower

Conflicts:
	app/index.html
	app/js/class.main.js
	app/js/states/state.game.run.js