for jana
Merge branch 'master' of https://github.com/JanaWengenroth/GKA1

Conflicts:
	Project/src/GKA/Graph/GKAGraph.java