Fixed My Organized Projects
Added function in Project Category Mapping
Fix merge conflicts in AbstractFacade
Fix merge conflicts in AbstractFacade