Merge branch 'staging' of https://github.com/swethaharshini/eApp into 10222014
Merge branch 'staging' of https://github.com/r-knowsys/eApp into 10222014
Merge branch 'staging' of https://github.com/r-knowsys/eApp into 10222014
Merge branch 'staging' of https://github.com/r-knowsys/eApp into 10222014
Merge branch 'staging' of https://github.com/r-knowsys/eApp into 10222014
Merge branch 'staging' of https://github.com/r-knowsys/eApp into 10222014
Merge branch 'staging' of https://github.com/r-knowsys/eApp into 10222014
#Bug 4599-EditClick
>Added employeelisr,editClick jsps
>Added imageId column in employee table to store fileEntryId of
DLFileEntry record
>Changed skillId,languageId,licenseId columns type to 'long' in
service.xml
#bug4599-editClick
Merge pull request #57 from srikanthvenna/master

Theme changes:
Merge branch 'staging' of https://github.com/r-knowsys/eApp into 10222014
#editClick jsp
employee list jsp
Merge pull request #58 from swethaharshini/staging

#Bug 4599-EditClick - Rendering the edit employee page on click of edit
Merge branch 'staging' of https://github.com/r-knowsys/eApp into 10222014
services portlet - add only service impl folder and remove the entire src folder from git tracking
add repos/sdk/portlets/services-portlet/docroot/WEB-INF/src/com/rknowsys/eapp/hrm/service/persistence folder for tracking
Merge pull request #59 from ram-pratap/10222014

Removed src folder in services-portlet from tracking and added only service impl, persistence folder.
Issue # 38 - Leave- Holiday portlet.
JobCategory-portlet