a lot of changes
Merge branch 'master' of https://github.com/pirovorster/ServiceHub

Conflicts:
	ServiceHub.Website/ServiceHub.Website/ServiceHub.Website.csproj