Merge origin/master

Conflicts:
	src/main/java/de/develman/mmi/model/Edge.java
	src/main/java/de/develman/mmi/model/Vertex.java