merged
merged again!
Merge branch 'master' of ssh://git@github.com/rlsutton1/VaadinUtils.git

Conflicts:
	src/main/java/au/com/vaadinutils/jasper/ui/JasperReportProperties.java
	src/main/java/au/com/vaadinutils/jasper/ui/JasperReportView.java