0819 typo
Merge branch 'ylc'

Conflicts:
	src/nthu/qrcode/service/mysql/QrphoneMysqlService.java