Merge pull request #2 from bpassini/Iteration2

Iteration2
updated RentalCenter UI, changed checkIn/checkOut, finished
searchEquipment and checkAvailability
typo
Merge remote branch 'origin/master' into Iteration3
started assignWorkSchedule - created a WorkSchedule and EmployeeShift
class. Need to change DB code and add UI to test it.
Merge remote branch 'origin/Iteration3' into Iteration3

Conflicts:
	ResortManagement/src/edu/iastate/cs362/ManagementSystem/ManagementSystem.java
	ResortManagement/src/edu/iastate/cs362/ManagementSystem/ManagementSystemController.java
	ResortManagement/src/edu/iastate/cs362/ManagementSystem/ManagementSystemControllerInterface.java
	ResortManagement/src/edu/iastate/cs362/ManagementSystem/ManagementSystemDBSupport.java
	ResortManagement/src/edu/iastate/cs362/ManagementSystem/ManagementSystemDBSupportInterface.java
	ResortManagement/src/edu/iastate/cs362/ManagementSystem/ManagementSystemInterface.java
	ResortManagement/src/edu/iastate/cs362/Resort/Resort.java
	ResortManagement/src/edu/iastate/cs362/Resort/ResortInterface.java