location functions
Merge branch 'master' of https://github.com/thanhhaimai/hug.me

Conflicts:
	package.json