ad
roboguice
Merge branch 'master' of https://github.com/WinHuStudio/iTrip

Conflicts:
	doc/iTrip.apk
	src/client/.classpath
	src/client/AndroidManifest.xml
	src/client/project.properties
	src/client/res/layout/fragment_sysconfig.xml
	src/client/res/values/strings.xml
	src/client/src/com/itrip/common/SuperActivity.java
	src/client/src/com/itrip/common/SuperFragment.java
	src/client/src/com/itrip/common/SuperFragmentActivity.java
	src/client/src/com/itrip/fragment/DemoFragment.java
	src/client/src/com/itrip/fragment/SysConfigFragment.java
	src/server/dao/iTrip.RelationCenter/Group.cs
	src/server/dao/iTrip.RelationCenter/One.cs
	src/server/dao/iTrip.RelationCenter/iTrip.RelationCenter.csproj
	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/relation/business/iTrip.Service.Business.Relation.RecipientParser/IServiceParser.cs
	src/server/service/relation/business/iTrip.Service.Business.Relation.RecipientParser/ServiceParser.cs
	src/server/service/relation/business/iTrip.Service.Business.Relation.RecipientParser/iTrip.Service.Business.Relation.RecipientParser.csproj
	src/server/service/relation/iTrip.Service.Relation/iTrip.Service.Relation.csproj
	src/server/settings/iTrip.Settings/Enums.cs