Interfaces
Interfaces
Merge remote-tracking branch 'origin'

Conflicts:
	build/built-jar.properties
	build/classes/krabprotocol/FXMLDocument.fxml
	build/classes/krabprotocol/FXMLDocumentController.class
	build/classes/krabprotocol/KrabProtocol.class
	build/nb-jfx.jks
	dist/KrabProtocol.html
	dist/KrabProtocol.jar
	dist/KrabProtocol.jnlp
	src/krabprotocol/FXMLDocument.fxml
	src/krabprotocol/KrabProtocol.java