1 branching model

• Reopen the branch 1-branching-model and the corresponding issue.
• The issue #1 (closed) has been closed to soon since the script build_version.py has to be adapted to the imporved branching model.
• This is performad by this merge request
• Closes #1 (closed).