(added rest of the entity  and bean skeleton ))
Merge origin/master