Completed setting up a base entity class
Added Version property
Merge remote-tracking branch 'origin/development'