Merge graphviewer/master

Conflicts:
	src/logic/GraphPanelModel.java
Merge graphviewer/master