#20 is added.
Close report changes and export to PDF
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	composer.json