- google reverse geolocation
Merge branch 'master' of https://github.com/edxe/socia_aee

Conflicts:
	app/scripts/controllers/detail.js
Merge branch 'master' of https://github.com/edxe/socia_aee

Conflicts:
	app/scripts/controllers/detail.js