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

Conflicts:
	app/js/sprites/sprite.towerNode.js