提交
Merge branch 'master' of https://github.com/Foboy/GOGOAdmin

Conflicts:
	GOGO.ActiveMQ/bin/Debug/GOGO.ActiveMQ.dll
	GOGO.ActiveMQ/bin/Debug/GOGO.ActiveMQ.pdb
	GOGO.ActiveMQ/obj/Debug/GOGO.ActiveMQ.csproj.FileListAbsolute.txt
	GOGO.ActiveMQ/obj/Debug/GOGO.ActiveMQ.csprojResolveAssemblyReference.cache
	GOGO.ActiveMQ/obj/Debug/GOGO.ActiveMQ.dll
	GOGO.ActiveMQ/obj/Debug/GOGO.ActiveMQ.pdb
	GOGOManageMent.v12.suo