conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/inputGeneration/SimpleTesting.java
	src/inputGeneration/jdbMonitor.java
	src/viewer/ViewPositionData.java