Merge branch 'rework_subscriptions' into notification_ui

Conflicts:
	src/api/app/models/event/request.rb
	src/api/app/models/event_find_subscribers.rb
	src/api/test/fixtures/event_subscriptions.yml