syso changed
Merge branch 'master' of https://github.com/MathiasLoewe/Awesomemap

Conflicts:
	bin/gui/DrawGraph$MyMouseAdapter.class
	bin/gui/DrawGraph$MyMouseListener.class
	bin/gui/DrawGraph$MyMouseWheelListener.class
	bin/gui/DrawGraph.class
	src/coastlines/CoastLines.java
Merge branch 'master' of https://github.com/MathiasLoewe/Awesomemap