Added Git attributes
Converted line endings
Merge branch 'develop'