-new modifications
Merge remote-tracking branch 'origin/master'

Conflicts:
	heartBeat/commons/src/heartbeat/project/commons/network/privatecast/factory/privatecast/streams/receive/ReceiveFileStream.java