用户简述与描述分开
Merge branch 'master' of github.com:MooDevTeam/Moo
Merge branch 'master' of github.com:MooDevTeam/Moo
Merge branch 'master' of github.com:MooDevTeam/Moo
Merge branch 'master' of github.com:MooDevTeam/Moo
Merge branch 'master' of github.com:MooDevTeam/Moo
Before Merge
Merge branch 'master' of github.com:MooDevTeam/Moo

Conflicts:
	Moo.API/JsonAPI.svc.cs