working bus hoorah
Merge branch 'master' of https://github.com/jimgolfgti/ship-it-11-2014

Conflicts:
	OnCallRota.Web/Controllers/TeamController.cs
	OnCallRota.Web/OnCallRota.Web.csproj
	OnCallRota.sln
	OnCallRota/OnCallRota/ServiceDefinition.csdef