2nd Attempt at VS2012 Commit

Also did a global crlf > lf change in the code

Are these ok ?