added small modifications to classes
conflicts resolved
Merge branch 'master' of https://github.com/Nipuni/portal
Merge branch 'master' of https://github.com/dhara-uom/portal
modification for web xml to fix request mappings
clean up respurces