commit to pull
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into
sprint1

Conflicts:
	leaveapp/web/.settings/org.eclipse.wst.common.component