0915 callActivity ui, actionBar ui
Merge branch 'master' of https://github.com/ylc1218/Qrapp2

Conflicts:
	res/layout/popup_contact.xml
	res/values/colors.xml
Merge branch 'master' of https://github.com/ylc1218/Qrapp2