Merge branch 'develop'
Specified goals of project, workflow and standards
Merge branch 'master' into develop