Merge branch 'release/0.4' of github.com:geometalab/osmaxx into relea…

…se/0.4

README.md

@@ -9,8 +9,15 @@ Website: http://osmaxx.hsr.ch/
 
 ## Development
 
-See https://github.com/geometalab/osmaxx-docs for documentations and [/docs/development.md](/docs/development.md) for
-more detailed instructions.
+* [Project Repository (Git)](/docs/git-repository.md)
+* [Project Development Environment (Docker)](/docs/project-development-environment.md)
+* [Commonly used commands for development](/docs/useful-commands.md)
+* [Deployment](/docs/deployment.md)
+
+We do not recommend to run the application local on your machine but it's possible. We recommend to use the development docker containers.
+
+**NOTE**: to run it locally (no docker), you might want to copy the .env-dist
+to .env and adapt the lines there.
 
 
 ## Run it locally on Linux

docs/git-repository.md

@@ -10,13 +10,15 @@ For developers have write access to this repository:
 
 2. Enable [git-flow](https://github.com/nvie/gitflow) for the local repo
 	```shell
+	git checkout master # or git checkout -b master origin/master
 	git flow init -d
 	```
 
 	(This project uses git-flow's default branch names and branch name prefixes, which `-d` automatically accepts.)
 
 	You should now be on the `develop` branch. Otherwise checkout the development branch: `git checkout development`.
 3. Clone the third party repositories we use through [git submodules](http://www.git-scm.com/book/en/v2/Git-Tools-Submodules)
+
 	```shell
 	git submodule init && git submodule update
 	```