add git hash to version string
VERSION update
Merge branch 'master' into develop-prod

Conflicts:
	VERSION
	setup.py