Rewrite for version 2.5.21.
Version 2.5.21.

Merge branch 'staging'

Conflicts:
	classes/class.tx_additionalreports_main.php
	classes/class.tx_additionalreports_util.php