Modification
Merge branch 'master' of https://github.com/aknoetig/PondEnvironmentMeasuring

Conflicts:
	PondEnvironmentMeasuring/src/app/controller/Controller.java
	PondEnvironmentMeasuring/src/app/view/GUI.java
Changes