test commit from vse
test feature add
another test class instance
Merge branch 'master' into dev

Conflicts:
	main.cpp