getData modified
Merge branch 'master' of https://github.com/RightHereRightNow/RightHereRightNow.github.io

Conflicts:
	APP/framework/controller.js