更新触控积分墙
Merge branch 'branch'

Conflicts:
	client/.DS_Store
	client/Classes/RootViewController.h
	client/Classes/RootViewController.m
	client/Classes/TaskTableViewController.mm
	client/LiZhuan.xcodeproj/project.pbxproj
	client/Lib/.DS_Store
	client/Lib/MJRefresh/.DS_Store
	server/.idea/vcs.xml
	server/.idea/workspace.xml
	server/project.iml
Merge branch 'master' into branch