Preparing for merge
fixed merge conflict
preparing for pull
Merge branch 'develop' of https://github.com/4950/ShittyPrototype into develop
Merge branch 'develop' of https://github.com/4950/ShittyPrototype into develop

Conflicts:
	CoreUI/_UpgradeReport_Files/UpgradeReport.css
	CoreUI/_UpgradeReport_Files/UpgradeReport.xslt
	CoreUI/_UpgradeReport_Files/UpgradeReport_Error.png
	CoreUI/_UpgradeReport_Files/UpgradeReport_Information.png
	CoreUI/_UpgradeReport_Files/UpgradeReport_Success.png
	CoreUI/_UpgradeReport_Files/UpgradeReport_Warning.png
	Game/ShittyPrototype.csproj
	Game/UpgradeLog.XML
	Game/UpgradeLog.htm
preparing for merge
Merge branch 'develop' of https://github.com/4950/ShittyPrototype into develop
fixed SparnerComponent Typo