0821 upload Img OK
Merge branch 'lowlow'

Conflicts:
	src/nthu/qrcode/mvc/control/ContactController.java