Refactored OrgUnit / Serie subscription

* Moved the adding/removing to/from the calendar to the UsersDAO
* Added lots of tests
* Cleaned up some code