Success
Merge branch 'master' into Added-XML-deserializer

Conflicts:
	Showcase.Core/Data/ShowcaseDataService.cs
	Showcase.userprefs
Merged