View PresentationModel Class created (CategoryPM)
categories.xhtml created
Commit G302
Changes G302
Merge origin/master

Conflicts:
	src/main/java/de/professional_webworkx/foormanager/domain/Item.java
	src/main/java/de/professional_webworkx/foormanager/domain/Unit.java
	src/main/webapp/addBuy.xhtml
	target/FoodManager-1.0-SNAPSHOT.war
	target/FoodManager-1.0-SNAPSHOT/WEB-INF/classes/de/professional_webworkx/foormanager/domain/Item.class
	target/FoodManager-1.0-SNAPSHOT/addBuy.xhtml
	target/classes/de/professional_webworkx/foormanager/domain/Item.class
	target/generated-sources/annotations/de/professional_webworkx/foormanager/domain/Category_.java
	target/maven-archiver/pom.properties
	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst