lots of changes for merging
added git attributes
normalize all the line endings
Merge branch 'goce'