0819 typo
Merge branch 'ylc'

Conflicts:
	src/nthu/qrcode/service/mysql/QrphoneMysqlService.java
Merge branch 'master' of https://github.com/ylc1218/QRphone
0821 asterisk

outgoing call: get imeiB from pubIdB (todo:black list)
incoming call: get pubIdB from imeiB
get psw of asterisk imei account
Merge branch 'master' of https://github.com/ylc1218/QRphone