0915 button, no contact, no contact to add `
Merge branch 'master' of https://github.com/ylc1218/Qrapp2

Conflicts:
	res/layout/popup_contact.xml
	res/values/colors.xml
0915 mute, speaker, callAct ui