added google location button
Merge branch 'master' of https://github.com/the-eejay/TranslinkMobile

Conflicts:
	res/layout/activity_main.xml