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
Theme changes:
table css
sign in button
Education portlet modified html markup in add and edit jsp files as per
bootstrap standards and edit button image replaced with font awesome
icon
#bug4599-editClick
Licenses portlet modified html markup in add and edit jsp files as per
bootstrap standards and edit button image replaced with font awesome
icon
Membership portlet modified html markup in add and edit jsp files as per
bootstrap standards and edit button image replaced with font awesome
icon
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