Changes to location finder
Merge branch 'master' of https://github.com/orangedog22/dealfish

Conflicts:
	Resources/app.js