[FIX] Replace carriage return by \r\n in resulted files

  * Readapt default template to be more beautiful or human readable
Merge branch 'master' into weblog