Added network type negotiation from 2013.02
Prepped build
[maven-release-plugin] prepare release dasein-cloud-openstack-2013.04.2
[maven-release-plugin] prepare for next development iteration
Merge branch '2013.04' into develop

Conflicts:
	pom.xml
Addressed conflicts