Adding encryption for the mapping from user to data
Merge remote-tracking branch 'upstream/develop' into BRIDGE-67
Merge pull request #1021 from marcel-blonk/BRIDGE-67

Adding encryption for the mapping from user to data