jimbo
Merge branch 'master' of https://github.com/sebastian-f/Produktkonfigurator

Conflicts:
	ProductConfigurator/ProductConfigurator.WebUI/Controllers/UserController.cs
	ProductConfigurator/ProductConfigurator.WebUI/Models/CategoryPartsViewModel.cs
	ProductConfigurator/ProductConfigurator.WebUI/Views/User/CategoryPartial.cshtml
	ProductConfigurator/ProductConfigurator.WebUI/Views/User/Index.cshtml
Merge branch 'master' of https://github.com/sebastian-f/Produktkonfigurator

Conflicts:
	ProductConfigurator/ProductConfigurator.WebUI/Controllers/UserController.cs
	ProductConfigurator/ProductConfigurator.v11.suo