added versioning and branching models
Merge branch 'develop'