added hibernate + entity mapping
Merge remote-tracking branch 'origin/master'