0821 ==
0821 NOTHING
0821 TEST UPLOAD
0821 uploadImg OK
Merge branch 'lowlow'

Conflicts:
	src/nthu/qrcode/qrapp2/scan/ScanResultHandler.java
Merge branch 'master' of https://github.com/ylc1218/Qrapp2

Conflicts:
	src/nthu/qrcode/qrapp2/MainActivity.java