Improve versioning of dev releases and update build.xml