Merge branch 'version' into develop

Conflicts:
	vvv
Update version to 1.2.1