fix datasources and other stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	saiku-reporting-backend/pom.xml
	saiku-reporting-backend/src/main/java/org/saiku/reporting/backend/component/StandaloneReportingComponent.java