0814 contact and group
Merge branch 'master' of https://github.com/ylc1218/Qrapp2

Conflicts:
	res/values/styles.xml
	src/nthu/qrcode/qrapp2/MainActivity.java
	src/nthu/qrcode/qrapp2/setting/AccountActivity.java
0814 image scan