modified .gitattributes
Merge branch 'master' into CAPER