update version etc
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.properties
	db/data/editor.lck
	db/data/editor.log
	db/data/editor.properties
	grails-app/vaadin/app/ContainerUI.groovy
xopus first cut embedded
xopus first cut embedded