协议第一次提交，未完成
Merge branch 'master' of https://github.com/WinHuStudio/iTrip

Conflicts:
	src/client/.classpath
	src/client/project.properties
	src/server/push/iTrip.Pusher/Properties/PublishProfiles/itrip.pubxml.user
	src/server/push/ws/iTrip.Push.Commands/iTrip.Push.Commands.csproj
	src/server/push/ws/iTrip.Push.ServerManager/iTrip.Push.ServerManager.csproj
	src/server/push/ws/iTrip.Push.iTripSession/iTrip.Push.iTripSession.csproj
	src/server/service/passport/iTrip.Service.Passport/Properties/PublishProfiles/itrip.pubxml.user
Merge branch 'master' of https://github.com/WinHuStudio/iTrip

Conflicts:
	src/client/.classpath
	src/client/project.properties
	src/server/push/iTrip.Pusher/Properties/PublishProfiles/itrip.pubxml.user
	src/server/push/ws/iTrip.Push.Commands/iTrip.Push.Commands.csproj
	src/server/push/ws/iTrip.Push.ServerManager/iTrip.Push.ServerManager.csproj
	src/server/push/ws/iTrip.Push.iTripSession/iTrip.Push.iTripSession.csproj
	src/server/service/passport/iTrip.Service.Passport/Properties/PublishProfiles/itrip.pubxml.user
	src/server/service/relation/iTrip.Service.Relation/iTrip.Service.Relation.csproj.user