terug naar back up
s
Merge branch 'master' of https://github.com/chill1992/Moyee-official

Conflicts:
	bin/classes/com/example/moyeecoffee/FragmentB.class
	bin/dexedLibs/actionbarsherlock-765a98324f6a4a1e6a9eaff256d07441.jar
	bin/dexedLibs/activation-a451b5992c524e48f688858a1fdd27da.jar
	bin/dexedLibs/additionnal-a9accf552a59c49b1ac15993eaac120e.jar
	bin/dexedLibs/mail-9701f36e369ba10e60b510596098e20c.jar
	bin/jarlist.cache
	res/layout/frag_b.xml
	res/layout/invoer_scherm.xml
	src/com/example/moyeecoffee/FragmentB.java