1
Merge branch 'master' of https://github.com/Pihail/diplomaProject

Conflicts:
	diplomaProject/src/main/MainWindowGui.java
	diplomaProject/src/main/MultilineButton.java
	diplomaProject/src/main/SettingsDialog.java
	diplomaProject/src/main/packetHandlerThread.java