Merged changes from maven branch
Updated the version to 1.5.0
Merge branch 'master' of github.com:OpenHMIS/openmrs-module-jasperreports

Conflicts:
	api/pom.xml
	omod/pom.xml
	pom.xml