resolved merge issues
Merge branch 'master' of https://github.com/webdev7x6/kc-actors-theatre

Conflicts:
	solution/KCActorsTheatre.Web/KCActorsTheatre.Web.csproj