Details on branches for dev / deploy workflow
Merge pull request #63 from owncloud/improve-readme

Improve readme
Add hotel options back to conf page