Version file
Merge branch 'release-0.3.3' into develop

Conflicts:
	VERSION