additional changes
more
merge

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

Conflicts:
	app/js/control/Game_new.js
	app/js/util/Helpers.js