Uploaded updated diagrams for Johan
Merge branch 'Voting' of https://github.com/RudigerRoach/301_main_emma into Voting
Merge branch 'Voting' of https://github.com/RudigerRoach/301_main_emma into Voting
Merge branch 'Voting' of https://github.com/RudigerRoach/301_main_emma into Voting
[Group effort] integrated server front and back ends and replaced SQL with db4o object database