small refactoring
Merge commit '3b055e4b57b2a3498630035cfea3f35d9ab39d82' into Refactoring_SDMLib

Conflicts:
	SDMLib.net/src/org/sdmlib/models/classes/ClassModel.java