added to iMac
location services
update
Merge branch 'master' into derek

Conflicts:
	res/layout/activity_main_screen.xml