fixed in-memory max history parameter handling, #ref 78
Merge branch 'dev' into elitist_68
fixed bug in conditionals of set_str_algo
cmasolution object print function now has access to pheno function in order to convert final solution back into phenotype when needed

Conflicts:
	src/cmasolutions.cc
	tests/test-functions.cc
Merge branch 'dev' of github.com:beniz/libcmaes into dev
Merge branch 'dev' into elitist_68