Some renaming of variables, small changes
Merge branch 'impact' of https://github.com/tufts-LASER/Trails-Forward-server into impact

Conflicts:
	public/dataController/TrailsForwardGameDataCache.js