0821 asteriskDb User
Merge branch 'ylc'

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