location.js
Merge branch 'master' into rts

Conflicts:
	package.json
parse float
project result
cosmetic