Nothing new.
Merge remote-tracking branch 'origin/master' into booking

Conflicts:
	bin/MobliePayment.apk
	bin/classes.dex
Merge pull request #14 from zhongwen/booking

Booking UI modification