changes in GraphFormat
Merge graphviewer/master

Conflicts:
	src/defs/GraphFormat.java
Merge graphviewer/master
Merge graphviewer/master

Conflicts:
	src/defs/GraphFormat.java
changes in GraphFormat