combine getting location js
Merge remote-tracking branch 'origin/master'

Conflicts:
	beike_project/templates/head.html