adjusted to new user entity
and refactored dataGenerator a bit
Merge pull request #129 from learning-layers/userEntityAdjustments

adjusted to new user entity