Add CONTRIBUTING.md
Merge branch 'dev'