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
Added js folder, css modifications and look and feel.xml changes
Merge pull request #55 from srikanthvenna/master

Added js folder, css modifications and look and feel.xml changes
Merge branch 'staging' of https://github.com/r-knowsys/eApp into 10222014
Added feature: Deleting workshift and all the employees shiftId in the
deleted workshift changed to 0.
changed showRequiredLabel = false
Merge pull request #56 from laxminarayanav/master

Delete function for Workshift
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