made changes to usertoaccessrightsmapping.xhtml
Merge branch 'sprint1' of https://github.com/kinmengBGM/bgm-hrm into sprint1
changes to user to access rights mapping
removed conflicts
made changes to usertoaccessrightsmapping.xhtml
resolved conflicts
Made changes to User To Access Rights Mapping
Erased Conflicts
Made Changes to User To Access Rights
Erased conflicts and made chnages to User To AccessRights
Added Scheduler for Monthly and Yearly added Leaves
Removed the conflicts
Added another scheduler for yearly refreshed leaves
Resolved Conflicts
Made Changes for schedulers.
Resolved conflicts
Made changes to spring-quartz.xml