A
Merge remote-tracking branch 'origin/Release3.0' into Release3.0

Conflicts:
	src/main/resources/eventLog.txt
Merge remote-tracking branch 'origin/Release3.0' into Release3.0
Merge remote-tracking branch 'origin/Release3.0' into Release3.0
Merge remote-tracking branch 'origin/Release3.0' into Release3.0
usb
usb
a