Finished HHM
Merge branch 'master' of https://datasystemsdesign.visualstudio.com/DefaultCollection/_git/BAX

Conflicts:
	src/Bax.Web/Bax.Web.csproj