Merge branch 'branch'
更新服务器端
Merge remote-tracking branch 'origin/master'
客户端，删除无用项目
客户端整理-- 清理无用的文件
后台运行
添加标题栏
添加下拉更新积分功能
米迪积分墙通知
Merge branch 'master' into branch

Conflicts:
	client/.DS_Store
	client/LiZhuan.xcodeproj/project.xcworkspace/xcuserdata/sngyai.xcuserdatad/UserInterfaceState.xcuserstate
	server/.idea/.name
	server/.idea/misc.xml
	server/.idea/modules.xml
	server/.idea/vcs.xml
	server/.idea/workspace.xml
	server/ebin/erl_crash.dump
	server/ebin/server.app
	server/ebin/server.cmd
	server/ebin/server.cmd.bak
	server/include/common.hrl
	server/include/record.hrl
	server/priv/src/record_proplist/record_info.hrl
	server/priv/src/record_proplist/test.erl
	server/project.iml
	server/server.iml
	server/sngyai_server.iml
	server/src/db/db_agent_user.erl
	server/src/lib/lib_user.erl
	server/src/lib/storage_file/lib_storage_file_player.erl
	server/src/lib/utils/lib_util_type.erl
	server/src/main.erl
	server/src/mod/gen_player/mod_player.erl
	server/src/mod/mod_init.erl
	server/src/networking/tcp_request_broker.erl
	server/start-dev.sh