bug fix
bug fixes part 3
Merge branch 'master' of https://github.com/kcarido/NDC_CMS
Bug fixing part 5