Merged group member count and count history tables

Hey,

As you mentioned yesterday, I've merged group member count into the count history table.

I wasn't sure what to do with the tests from GroupMembership DAO as they are slightly different. So I included them in this commit to show that everything still works fine, but you may want to remove them before you merge it with the master branch.

Thanks

Aaron