Two maximum configurations

There are now two maximum configuration algorithms working for a few
test cases.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/client/Windows/ConfigTab.java