Add attributes file

Also update line endings of files
Merge branch 'master' into apple