merging
Fixing some final problems
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/testing/MainTest.java
	src/utils/WellParameters.java