Properties Änderung
Merge branch 'master' of https://github.com/andreas-monschau/HaegERP01

Conflicts:
	haegerp/.classpath
	haegerp/target/test-classes/org/haegerp/entity/Article_ArticleCategoryTest.class

Merge