Cleanups
Merge branch 'develop' into staging

Conflicts:
	.gitignore
make standard