0911 tab color/icon
Merge branch 'master' of https://github.com/ylc1218/Qrapp2

Conflicts:
	res/layout/fragment_contact.xml
	src/nthu/qrcode/qrapp2/fragment/ContactFragment.java