Catalogue deleting
Merge branch 'master' of https://github.com/open-infinity/community

Conflicts:
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/entity/target/classes/org/openinfinity/domain/entity/Catalogue.class
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/entity/target/classes/org/openinfinity/domain/entity/ShoppingList.class
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/entity/target/entity.jar
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/entity/target/generated-sources/delombok/org/openinfinity/domain/entity/Catalogue.java
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/entity/target/generated-sources/delombok/org/openinfinity/domain/entity/Product.java
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/entity/target/generated-sources/delombok/org/openinfinity/domain/entity/ShoppingList.java
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/entity/target/maven-archiver/pom.properties
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/entity/target/surefire-reports/TEST-org.openinfinity.domain.service.ProductCatalogueUnitTest.xml
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/entity/target/surefire-reports/org.openinfinity.domain.service.ProductCatalogueUnitTest.txt
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/antrun/build-main.xml
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/classes/org/openinfinity/web/controller/ProductController.class
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/maven-archiver/pom.properties
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/mvc/WEB-INF/classes/org/openinfinity/web/controller/ProductController.class
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/mvc/WEB-INF/lib/entity-2.0.0.jar
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/mvc/WEB-INF/lib/repository-2.0.0.jar
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/mvc/WEB-INF/lib/service-2.0.0.jar
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/mvc/WEB-INF/views/catalogue/listAll.jsp
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/mvc/WEB-INF/web.xml
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/mvc/target/shoppinglist.war
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/repository/target/classes/META-INF/spring/mongo-repository-context.xml
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/repository/target/maven-archiver/pom.properties
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/repository/target/repository.jar
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/repository/target/surefire-reports/TEST-org.openinfinity.domain.repository.ProductRepositoryIntegrationTest.xml
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/repository/target/surefire-reports/org.openinfinity.domain.repository.ProductRepositoryIntegrationTest.txt
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/service/target/maven-archiver/pom.properties
	open-infinify-community/codecamps/helsinki-university-2013Q2/B/open-infinity-parent/service/target/service.jar