commit
Merge branch 'master' of https://github.com/mossowski/JEE

Conflicts:
	src/main/java/com/example/jeedemo/domain/Sandwich.java
	src/main/java/com/example/jeedemo/domain/Seller.java
	src/main/java/com/example/jeedemo/service/SandwichManager.java
	src/main/java/com/example/jeedemo/web/SandwichFormBean.java
	src/main/webapp/views/main/menu.xhtml
	target/classes/com/example/jeedemo/domain/Sandwich.class
	target/classes/com/example/jeedemo/service/SandwichManager.class
	target/classes/com/example/jeedemo/web/SandwichFormBean.class
	target/jeedemo.war
	target/jeedemo/WEB-INF/classes/com/example/jeedemo/domain/Sandwich.class
	target/jeedemo/WEB-INF/classes/com/example/jeedemo/service/SandwichManager.class
	target/jeedemo/WEB-INF/classes/com/example/jeedemo/web/SandwichFormBean.class
	target/jeedemo/WEB-INF/classes/import.sql
	target/jeedemo/views/main/menu.xhtml
	target/m2e-wtp/web-resources/META-INF/maven/com.example/jee6demo/pom.properties
	target/maven-archiver/pom.properties