Fix archive names and allow a different package version

Fix #139
Merge branch 'issue/139' into issue/139-asc

Conflicts:
	build.xml
Merge pull request #146 from nickvergessen/issue/139-asc

[3.1] Fix archive names and allow a different package version
Merge pull request #145 from nickvergessen/issue/139

[3.0] Fix archive names and allow a different package version
Merge branch 'develop-olympus' into develop-ascraeus