Merge pull request #52 from R-Knowsys/staging

From Staging to Master on Oct 29th 2014
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
#Changes made in services-portlet
1.Deleted leaverule entity and leavetypeapplicability
2.Added LeaveGeneral and LeaveRuleApplicable entities
#Deleted LeaveRule,LeaveTypeApplicability entities and added
LeaveGeneral,LeaveRuleApplicable entities
#LeaveType portlet
Merge pull request #101 from swethaharshini/11052014

LeaveType-Portlet
Merge pull request #102 from R-Knowsys/v1.0

V1.0
New theme for eapp (Horizontal menu with multi level navigation and new
look for portlets)
Merge pull request #105 from srikanthvenna/v1.0

New theme for eapp (Horizontal menu with multi level navigation and new
Merge pull request #2 from R-Knowsys/v1.0

V1.0
#Displaying Employee documents from DLFileEntry
Merge pull request #106 from swethaharshini/11052014

Displaying Employee documents based on expando values
PimReports-portlet
Theme changes (color schemes), education portlet and employment status
portlet changes.
#Leave Type portlet
services portlet local service impl classes
Merge pull request #107 from laxminarayanav/master

PimReports-portlet