commit
Merge branch 'master' of https://github.com/ZHiteam/ZHGreenFuture

Conflicts:
	ZHGreenFuture/ZHGreenFuture.xcodeproj/project.pbxproj
commit
Merge branch 'master' of https://github.com/ZHiteam/ZHGreenFuture

Conflicts:
	ZHGreenFuture/ZHGreenFuture.xcodeproj/project.pbxproj