Changed Class-visibility of Entity to default (package)
Merge remote-tracking branch 'origin/master'