design sht
Merge branch 'master' of github.com:duytrann/HipperEnterpriseTeam4

Conflicts:
	HipperEnterprise
V0.3/src/main/webapp/WEB-INF/jsp/exercise/exercise_list.jsp
	HipperEnterprise
V0.3/src/main/webapp/WEB-INF/jsp/patient/listpatient.jsp
	HipperEnterprise
V0.3/target/HipperEnterprise-1.0-SNAPSHOT/WEB-INF/jsp/exercise/exercise_list.jsp
	HipperEnterprise
V0.3/target/HipperEnterprise-1.0-SNAPSHOT/WEB-INF/jsp/patient/listpatient.jsp