laser-hair
Merge remote-tracking branch 'origin/master'

Conflicts:
	Vanity/MvcWebUI/MvcWebUI.csproj