fixes
Merge branch 'BRANCH_PLATFORM_3_1' of github.com:idega/com.idega.block.datareport into BRANCH_PLATFORM_3_1

Conflicts:
	src/java/com/idega/block/datareport/presentation/ReportGenerator.java