Fixed ResortDBSupport errors
Merge remote-tracking branch 'origin/Iteration3' into Iteration3