Rename jsp pages, merge conflict files with sherlyn
Merge branch 'master' of https://github.com/kcarido/NDC_CMS