changing dos2unix line endings
Merge branch 'master' into sonal