Fixed changelog for 2.1
Fixed changelog for 2.0.4
Merge branch 'v2.0' into v2.1-pdfmanual
fixed changelog for 2.1