ss
Merge remote-tracking branch 'origin/master'

Conflicts:
	Vanity/MvcWebUI/Views/Shared/PartialAd.cshtml
	Vanity/MvcWebUI/Views/Shared/PartialErickaFeaturesSimple.cshtml
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 3510370540fd21d9b4fa3f42d2f98cf37261acaa.
Merge branch 'master' of https://github.com/jecabana/immsea