merge @j-ed's version and fix layout
Merge pull request #193 from owncloud/fixing-stable6

[WIP] fixing typos and spelling
Merge pull request #190 from owncloud/fix-all

merge @j-ed's version and fix layout
Merge branch 'stable6' into fixing-stable6

Conflicts:
	admin_manual/configuration/custom_mount_config_gui.rst
	admin_manual/maintenance/backup.rst
	admin_manual/maintenance/restore.rst