Update VERSION
Merge branch 'master' into dev

Conflicts:
	fteproxy/VERSION