Lots of minor changes.
Merge origin/master

Conflicts:
	src/main/java/com/mw2/pts4_cims/core/communication/communicationMain/CommunicationController.java