Merge pull request #364 from owncloud/fix-305-356

fixes #305 and #356, add next steps
Conflicts:
	admin_manual/installation/installation_source.rst