Merge branch 'master' of 192.168.0.34:workspace/Sahara-WI
Cherry picked database record.
Merge branch 'master' of 192.168.0.34:workspace/Sahara-WI
Refractored database table record entity names to be consistent with base entity.
Implemented more of adding a new record.
Implemented more of inserting a record.
Merged dao level changes.