整理代码
Merge branch 'master' of https://github.com/sunboy4103/Zhizhi.git

Conflicts:
	JazzyListView/bin/jazzylistview.jar
	appcompat_v7/bin/android-support-v7-appcompat.jar