Added CONTRIBUTING file
Merge branch '2.0-master' into 2.0-dev
Fixed line feeds