Update docs
Merge branch 'develop'
Update docs
Merge branch 'develop'

Conflicts:
	MANUAL.md
Update docs