Embeded Google Maps API.
Merge branch 'master' of https://github.com/Ethanator/Carefree

Conflicts:
	CarefreeAndroid/.idea/misc.xml
	CarefreeAndroid/.idea/modules.xml
	CarefreeAndroid/.idea/workspace.xml