cleanup
Merge branch 'develop'

Conflicts:
	docs/index.html