x
Merge branch 'master' of https://github.com/pisceanfoot/xSimulate
s
Merge branch 'master' of https://github.com/pisceanfoot/xSimulate

Conflicts:
	Source/xSimulate.UI/xSimulate.UI.csproj
	Source/xSimulate.Web/Configs/Data/Database.config
SaveCustomerSetting
Merge branch 'master' of https://github.com/pisceanfoot/xSimulate
x