Improve engine.
Merge branch 'master' of https://github.com/CVVisualPSETeam/CVVisual

Conflicts:
	src/stfl/stfl_engine.hpp