Updated some files
Merged Branches
Merge branch 'gh-pages' into test

Conflicts:
	user-guide/Installation.md