Define a branching model

[CapacitorSet]

Now that we have a clean tree, we need to discuss a branching model, so that we don't end up again with all work on a feature-branch-of-development-branch and the master gets ignored.

[blackdev1l]

http://nvie.com/posts/a-successful-git-branching-model/