Merge branch 'develop'
fixing PBS issue on QB (hopefully)
tabs to space
Merge branch 'master' into develop-prod

Conflicts:
	VERSION