0914 contact popup
Merge branch 'master' of https://github.com/ylc1218/Qrapp2

Conflicts:
	res/values/colors.xml