Merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	ampl.test/src/ampl/test2/handlers/AmplTestHandler.java
	hu.viking.cooptpxsystem.ampl.solver/src/hu/viking/cooptpxsystem/ampl/solver/SolverAPI.java