Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	Client/src/main/java/arch/galaxyeclipse/client/ui/ChatWidget.java
	Client/src/main/java/arch/galaxyeclipse/client/ui/DefaultButtonBuilder.java
	Client/src/main/java/arch/galaxyeclipse/client/ui/IButtonBuilder.java
	Client/src/main/java/arch/galaxyeclipse/client/ui/view/FlightModeStage.java