updated code
Merge branch 'master' of https://github.com/jms8142/worldD

Conflicts:
	app/js/control/Location.js
	app/js/drawableElements/GameTile.js