merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bim_WORKSHOP/bin/gui/views/IfcObjectCountView.class
	Bim_WORKSHOP/src/gui/views/IfcObjectCountView.java
Kommentare bis Slab
Kommentare 1. Version fertig
Merge branch 'master' of https://github.com/PaulDebus/Bim.git

Conflicts:
	Bim_WORKSHOP/bin/gui/views/IfcObjectCountView.class
	Bim_WORKSHOP/src/gui/views/IfcObjectCountView.java