avoid double ${edition}
zip-assembly
release vs. nightly timestamps
comments..
Merge branch 'core' into astronomy

Conflicts:
	pom.xml
	src/main/assembly/resources-component.xml