Create .gitattributes
Merge branch 'develop'