0821 group
Merge branch 'lowlow'
Merge branch 'ylc'

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