what?
Merge branch 'master' of github.com:JPomichael/estay_ecs

Conflicts:
	We7.Share/Thinkment.Data/obj/Debug/Thinkment.Data.dll