some changes on DAO objects and entities
repair commit with all the changes I have made on entities and dao objects
Merge pull request #1 from tplevko/master

added some changes to entities and DAO object