合并后结果
Merge branch 'master' of https://github.com/chentaov5/FiveMonkeys.git

Conflicts:
	FinProject/src/com/qihoo/feiyang10/sys/ContactsUtils.java
	FinProject/src/com/qihoo/feiyang10/ui/MainActivity.java