Merge origin/master

Conflicts:
	src/java/edu/utopia/beans/RentalBean.java