commit
Merge https://github.com/hp279/interferometer.server

Conflicts:
	src/main/java/org/interferometer/BorderGraph.java
	src/main/java/org/interferometer/math/graph/Matchings.java
	src/main/java/org/interferometer/math/graph/Utils.java

commit