后端库引用
Merge remote-tracking branch 'origin/master'

Conflicts:
	Contact/src/com/jiec/utils/PhoneUtils.java