several changes
update before Alberto's fork
Merge branch 'master' of https://github.com/violador/catalyst

Conflicts:
	data/readme.lyx
	data/readme.lyx~
	scratch/test_from_the_catalystrc.log
	test__catalyst.cpp