mark dev branch
mark master
merge from dev to master

Conflicts:
	test.cpp