Improved manual
Typo
Merge branch 'v2.0'

Conflicts:
	user-doc/Installation.txt