a
Merge branch 'master' of https://github.com/HuigllOrg/HTBox

Conflicts:
	src/HTBox.Web/HTBox.Web.csproj
	src/HTBox.sln