cosmetics + fix compilation for clang
Merge branch 'master' of github.com:CVVisualPSETeam/CVVisual

Conflicts:
	src/stfl/stfl_engine.hpp