fix git attributes
fix gitattributes again
move module file
Merge branch 'master' into separate-libs
many fixes