thaodtp/hfis_c1208i_sem4_g1 — pull request #20 by nguyenquanghuy1997 (2014-07-17 17:48:50+00:00)
Title: 135Merge origin/master

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