moved imports and dummy entities to job, fixes #167
bidirectional relations - fixes #191
Merge remote-tracking branch 'origin/develop' into develop