Merge pull request #1383 from dgough/next

Fixed doxygen warnings in headers
Normalize line endings
Merge pull request #1384 from seanpaultaylor/next

Normalize line endings
Changed git attributes file
Added mm to gitattributes