Merge origin/master

Conflicts:
	src/java/biz/LabScheduleManager.java
	src/java/da/LabScheduleJpaController.java
	src/java/ui/LabScheduleUI.java
	web/admin/requests.xhtml