cleanup for final release - step 1
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	core/build.number
	core/src/main/resources/META-INF/version.info
	web/src/main/webapp/WEB-INF/betterform-version.info
cleanup for final release - step 1
Merge branch 'release/betterFORM5'