Completed database schema and refreshed edmx
Merge pull request #6 from jonathon-walker/DBSchema

Completed database schema and refreshed edmx