Admin page
Merge branch 'master' of https://github.com/sisyfos/cms

Conflicts:
	CMS/CMS.csproj
	CMS/Controllers/ShowCategoryController.cs