Finishing javadocing and correcting ResortDBSupport
Merge remote branch 'origin/Iteration1' into Iteration1
Fixed some merging issuses with Customer and Resort