Merge origin/master

Conflicts:
	src/java/edu/utopia/beans/RentalBean.java
	web/Admin/index.xhtml
	web/Admin/registerEmployee.xhtml
	web/index.xhtml
	web/registerCustomer.xhtml