category controller
Merge branch 'master' of github.com:igor-chernetsky/iteachart

Conflicts:
	iteachart/Views/Shared/_Layout.cshtml
	iteachart/iteachart.csproj
Merge branch 'master' of github.com:igor-chernetsky/iteachart

Conflicts:
	Infrastructure/Services/ICategoryService.cs