Merge origin/master

Conflicts:
	src/java/biz/LabScheduleManager.java
	src/java/da/LabScheduleJpaController.java
	src/java/ui/LabScheduleUI.java
	web/admin/requests.xhtml
Merge pull request #14 from nguyenquanghuy1997/master

1354135
Merge origin/master

Conflicts:
	src/java/ui/LabUI.java