location.js
Merge remote-tracking branch 'origin/rts'

Conflicts:
	app.js
	package.json
pulled up renames