0818 forget to merge!
Merge branch 'master' into lowlow

Conflicts:
	src/nthu/qrcode/qrapp2/MainActivity.java
0819 contact to server
Merge branch 'lowlow'

Conflicts:
	src/nthu/qrcode/qrapp2/http/HttpAsyncTask.java
	src/nthu/qrcode/qrapp2/scan/ScanResultHandler.java
	src/nthu/qrcode/qrapp2/sip/CallService.java