Add support for notification of events and loading of values in SharedHashMap
Merge remote-tracking branch 'origin/master'

Conflicts:
	affinity/pom.xml