0828 update user name
Merge branch 'master' of https://github.com/ylc1218/Qrapp2

Conflicts:
	project.properties
	src/nthu/qrcode/qrapp2/contact/NewContactActivity.java
0829 only test
Merge branch 'master' of https://github.com/ylc1218/Qrapp2