Feature csprojconventions

Fixed line ending issues then rebased #59