Merge pull request #98 from swethaharshini/11052014

Fixed  issues in Employee,LeaveType and LeaveHoliday portlets
Merge pull request #31 from R-Knowsys/11052014

Fetching from 11052014