Verbump + tag
Merge branch 'master'

Conflicts:
	VERSION