added control of stopping criteria to parameter object + test functions exe, ref #74

Conflicts:
	src/cmastopcriteria.cc
	src/cmastrategy.cc
	tests/test-functions.cc