fix for updating software version numbers
Merge branch 'development' into release_v3.5.0

Conflicts:
	build.properties
	eclipse_ws/biobank2.feature.core/feature.xml
	eclipse_ws/biobank2.feature.platform/feature.xml
	eclipse_ws/biobank2/META-INF/MANIFEST.MF
	eclipse_ws/biobank2/biobank2.product