Module 1 Integration done
Merge remote-tracking branch 'origin/master' into booking

Conflicts:
	bin/MobliePayment.apk
	bin/classes.dex