commit so I can pull
Merge branch 'master' of https://github.com/Grodien/APPE.f1301.01

Conflicts:
	fbsguiclient/lib/fbsservice/appe_fbsservice-0.0.0.0.shared.jar
	fbsloader/lib/fbsdata/appe_fbsdata-0.0.0.jar
	fbsloader/lib/fbsdata/appe_fbsdata-0.0.0.shared.jar
	fbsloader/lib/fbsguiclient/appe_fbsguiclient-0.0.0.jar
	fbsloader/lib/fbsservice/appe_fbsservice-0.0.0.0.shared.jar
	fbsloader/lib/fbsservice/appe_fbsservice-0.0.0.jar
	fbsservice/lib/fbsdata/appe_fbsdata-0.0.0.shared.jar
	fbsservice/src/main/java/ch/hslu/appe/fs1301/business/shared/dto/DTOBestellposition.java
	fbsservice/src/main/java/ch/hslu/appe/fs1301/business/shared/dto/DTOBestellung.java
	fbsservice/src/main/java/ch/hslu/appe/fs1301/business/shared/dto/DTOConverter.java
	fbsservice/src/main/java/ch/hslu/appe/fs1301/business/shared/dto/DTOKorrespondenz.java
	fbsservice/src/main/java/ch/hslu/appe/fs1301/business/shared/dto/DTOKorrespondenzTemplate.java
	fbsservice/src/main/java/ch/hslu/appe/fs1301/business/shared/dto/DTOPerson.java
	fbsservice/src/main/java/ch/hslu/appe/fs1301/business/shared/dto/DTOProdukt.java
	fbsservice/src/main/java/ch/hslu/appe/fs1301/business/shared/dto/DTORechnung.java
	fbsservice/src/main/java/ch/hslu/appe/fs1301/business/shared/dto/DTOZentrallagerBestellung.java
Merge branch 'master' of https://github.com/Grodien/APPE.f1301.01
Modified GUI with "Erstellte Bestellungen"