rollbacking
commit before sync
Merge branch 'master' of https://github.com/ipmedt4project/projectipmedt4

Conflicts:
	100+ Management Models/bin/AndroidManifest.xml
	100+ Management Models/bin/classes/com/example/app/CustomerMod10.class
	100+ Management Models/bin/classes/com/example/app/CustomerMod9.class
	100+ Management Models/bin/classes/com/example/app/DatabaseModels.class
	100+ Management Models/bin/classes/com/example/app/HomeScreen.class
	100+ Management Models/bin/classes/com/example/app/R$id.class
	100+ Management Models/bin/classes/com/example/app/R$layout.class
	100+ Management Models/bin/classes/com/example/app/R$menu.class
	100+ Management Models/bin/classes/com/example/app/R$string.class
	100+ Management Models/bin/classes/com/example/app/R$style.class
	100+ Management Models/gen/com/example/app/R.java
	100+ Management Models/src/com/example/app/CustomerMod10.java
	100+ Management Models/src/com/example/app/CustomerMod9.java
oke
commit before sync again