innan ze pull
Merge branch 'master' of https://github.com/sisyfos/cms

Conflicts:
	CMS/Content/Site.css
	CMS/Controllers/MenuController.cs
	CMS/Models/cms.Designer.cs
	CMS/Models/cms.edmx
lagt in hur olika templates laddas för olika kategorier