Issue # 38 - Leave- Holiday portlet.
Issue # 69: Leave Types 
This checkin includes:
1. Leave Types
2. Leave Rule
3. Leave Restriction
4. Leave Type Applicability
5. Leave Carry Forward
Merge branch 'staging' of https://github.com/geetaarora01/eApp into geetaarora01-leave

Conflicts:
	repos/sdk/portlets/hrm-common/src/com/rknowsys/eapp/hrm/util/ApplicationConstants.java
	repos/sdk/portlets/services-portlet/docroot/WEB-INF/service.xml
	repos/sdk/portlets/services-portlet/docroot/WEB-INF/src/com/rknowsys/eapp/hrm/model/impl/NationalityBaseImpl.java
	repos/sdk/portlets/services-portlet/docroot/WEB-INF/src/com/rknowsys/eapp/hrm/model/impl/NationalityCacheModel.java
	repos/sdk/portlets/services-portlet/docroot/WEB-INF/src/com/rknowsys/eapp/hrm/model/impl/NationalityImpl.java
	repos/sdk/portlets/services-portlet/docroot/WEB-INF/src/com/rknowsys/eapp/hrm/model/impl/NationalityModelImpl.java
	repos/sdk/portlets/services-portlet/docroot/WEB-INF/src/com/rknowsys/eapp/hrm/service/base/NationalityLocalServiceBaseImpl.java
	repos/sdk/portlets/services-portlet/docroot/WEB-INF/src/com/rknowsys/eapp/hrm/service/base/NationalityLocalServiceClpInvoker.java
	repos/sdk/portlets/services-portlet/docroot/WEB-INF/src/com/rknowsys/eapp/hrm/service/impl/HolidayLocalServiceImpl.java
	repos/sdk/portlets/services-portlet/docroot/WEB-INF/src/com/rknowsys/eapp/hrm/service/persistence/HolidayPersistenceImpl.java
commit to resolve conflicts
commit to resolve conflicts
Merge branch 'geetaarora01-leave' into 11052014
Merge pull request #86 from ram-pratap/11052014

Leave Holidays and Leave Type/Rule