Moving branching towards gitflow
Simplified handling of branching/tagging
Merge branch 'master' into develop