Improve branch management

[3dde]

I suggest that from the moment we have a closed beta, we structure our branches as follows:

• main branch (release branch)
• development branch (commits get merged into main when they are stable and finished)
• feature branches (when needed for larger features, get merged into the development branch and from there into main)