changed the equals() methods in all of the domain classes so that there
is only a single if statement and changed some variable names.
Merge remote-tracking branch 'origin/Iteration1_refactoring'