Added model classes - hibernate full works

Merge branches to MASTER