Category membership/Name space update

Our files kind of got jumbled, so this is the most up-to-date set.  It has all the Name space changes and everything else Matt and Rebecca worked on today, plus all my CategoryMemberDao files.

Additionally, all (and I mean all) the daos have been tested, and all their tests are currently functional and returning no issues