Merged
Merge branch 'master' of https://github.com/selig/qea.git
Merge branch 'master' of https://github.com/selig/qea.git
Small changes when debugging.
Merge branch 'master' of https://github.com/selig/qea.git

Conflicts:
	code/qea/src/benchmark/competition/offline/Monpoly.java
	code/qea/src/benchmark/competition/offline/Qea.java
	code/qea/src/benchmark/competition/offline/Stepr.java
	code/qea/src/monitoring/impl/XMLFileMonitorSAX.java