CS-4704: add subscriptions to mapping
Merge pull request #307 from ahilles107/CS-4704_subsciption_manager

CS-4704: add subscriptions to mapping