just a pull
Merge branch 'master' of https://github.com/sebastian-f/Produktkonfigurator

Conflicts:
	ProductConfigurator/ProductConfigurator.v11.suo