Feature #351 : adding possibility to force a subscription to a user or a group of users
- fixing some merge errors
- refactoring some code