s/subscriptions/subscription for Contact
Merge branch 'develop' into feature/issue-139-contacts-saving-is-broken-because-of-badly-named-subscription-field
Merge branch 'feature/issue-139-contacts-saving-is-broken-because-of-badly-named-subscription-field' into develop