merge .gitignore from namespace
normalize all line endings
Merge branch 'master' into namespace