Merge branch 'master' of https://github.com/stsacademy/STS-Workbench

Conflicts:
	STS.Workbench/STS.Workbench.csproj