xml generatie
Google Maps werkt in het linker tabblad.
Merge branch 'master' of https://github.com/chill1992/Moyee-official into Mark-wip

Conflicts:
	.classpath
	.project
	bin/MoyeeCoffee.apk
	bin/classes.dex
	bin/classes/com/example/moyeecoffee/R$id.class
	bin/jarlist.cache
	bin/resources.ap_

conflicten opgelost