Notes about feature and develop branches
Fix spacing
Merge pull request #331 from galthaus/develop

Fix docs from master commits.