0821 create Contact class
Merge branch 'ylc'

Conflicts:
	src/nthu/qrcode/qrapp2/db/DbUserQuery.java
	src/nthu/qrcode/qrapp2/scan/ScanResultHandler.java