adding module for getting geolocation and extra information
Merge remote-tracking branch 'origin/master' into fb

Conflicts:
	app/index.html
	app/scripts/controllers/main.js