enter 2x
Merge branch 'master' of https://github.com/aloysiusari/CODEX

Conflicts:
	CodeX.Ronin.Web.ControlPanel/Program/SiteOrganization/Site/SiteEntry.aspx