encoded QR code message in JSON
Merge branch 'master' of https://github.com/JustinHoUMD/Tapp

Conflicts:
	bin/Tap_Latest.apk
	bin/classes.dex
	bin/classes/com/example/tap_latest/DisplayContactQR$1.class
	bin/classes/com/example/tap_latest/DisplayContactQR$2.class
	bin/classes/com/example/tap_latest/DisplayContactQR.class
	bin/classes/com/example/tap_latest/ReceiveContact$1.class
	bin/classes/com/example/tap_latest/ReceiveContact$2.class
	bin/classes/com/example/tap_latest/ReceiveContact$3.class
	bin/classes/com/example/tap_latest/ReceiveContact$4.class
	bin/classes/com/example/tap_latest/ReceiveContact$5.class
	bin/classes/com/example/tap_latest/ReceiveContact.class
	src/com/example/tap_latest/DisplayContactQR.java
	src/com/example/tap_latest/ReceiveContact.java
modified display and receive activity
Merge branch 'master' of https://github.com/JustinHoUMD/Tapp