small changed to mapper classes
DataFactoryImpl improved
reshuffled the two mapping classes
fix for auxliliary roles
Merge branch 'develop' into feature/tboxreasoner-improved
Merge branch 'feature/tboxreasoner-improved' into develop