0820 ringback0820
Merge branch 'ylc'

Conflicts:
	src/nthu/qrcode/qrapp2/sip/CallReceiver.java
	src/nthu/qrcode/qrapp2/sip/CallService.java
0820 comment//
Merge branch 'master' of https://github.com/ylc1218/Qrapp2