Adding git attributes
Merge branch 'develop'