service xml issues fixed
leave type
-Merge branch '11052014' of https://github.com/r-knowsys/eApp into 11052014

Conflicts:
	repos/sdk/portlets/Leave-Holidays-portlet/docroot/html/holiday/add_edit_holiday.jsp
	repos/sdk/portlets/LeaveType-portlet/docroot/html/leavetype/edit_leave_rule.jsp
Merge pull request #100 from ram-pratap/11052014

resolving conflicts
Merge pull request #32 from R-Knowsys/11052014

test employee