Add a comment in the head of the DeviceShimmer class
Merge branch 'master' into experimentalBranch

Conflicts:
	src/communicationManager/datareceiver/DeviceShimmer.java