Made Changes to roles and role mapping
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into
sprint1

Conflicts:
	leaveapp/web/src/main/webapp/WEB-INF/spring/spring-masterdata.xml
changes to usertorole.xhtml
made changes to spring-masterdata.xml