Gijs ze google maps is geintregeerd met mijn koopfunctie, loopt vast op de knoppen

Groet Jeroen
omdat het merge niet lukte heb ik geprobeer dit geprobeerd aan te passen, we gaan verder op een andere metehode

Groet jeroen
De WIP van koopfunctie bijgevoegd

Merge branch 'master' of https://github.com/chill1992/Moyee-official into Mark-wip

Conflicts:
	bin/classes.dex
	bin/classes/com/actionbarsherlock/R$attr.class
	bin/classes/com/actionbarsherlock/R$color.class
	bin/classes/com/actionbarsherlock/R$dimen.class
	bin/classes/com/actionbarsherlock/R$drawable.class
	bin/classes/com/actionbarsherlock/R$layout.class
	bin/classes/com/actionbarsherlock/R$string.class
	bin/classes/com/actionbarsherlock/R$style.class
	bin/classes/com/example/moyeecoffee/Koffie.class
	bin/classes/com/example/moyeecoffee/R$drawable.class
	bin/classes/com/example/moyeecoffee/R$id.class
	bin/classes/com/example/moyeecoffee/R$integer.class
	bin/classes/com/example/moyeecoffee/R$layout.class
	bin/classes/com/example/moyeecoffee/R$menu.class
	bin/classes/com/example/moyeecoffee/R$string.class
	bin/classes/com/example/moyeecoffee/R$style.class
	bin/classes/com/example/moyeecoffee/R$styleable.class
	bin/jarlist.cache
	bin/resources.ap_
	gen/com/actionbarsherlock/R.java
	gen/com/example/moyeecoffee/R.java
commit van jonathan
Merge branch 'master' of https://github.com/chill1992/Moyee-official into Mark-wip
pull from master