Try to fix merge conflics.
Merge branch 'dev' of https://github.com/atarr2/Phase-Zero into register_page

Conflicts:
	src/Monolith/Monolith.csproj