[pom] change version to 1.0-M3-SNAPSHOT
merge in Mike's changes
Merge branch 'merge' into v1.0-M3

Conflicts:
	bin/common-run
	configs/blitz/configs/blitz.config
	configs/jini/configs/fiddler.config
	configs/jini/configs/mahalo.config
	configs/jini/configs/mercury.config
	configs/jini/configs/norm.config
	configs/jini/configs/outrigger.config
	configs/sos-providers/exertmonitor.config
	lib/rio/config/platform/rio.groovy
	sos/sorcer-api/src/main/java/sorcer/core/provider/proxy/Partnership.java
	sos/sorcer-api/src/main/java/sorcer/core/provider/proxy/ProviderProxy.java
	sos/sos-env/src/main/java/sorcer/core/SorcerConstants.java
	sos/sos-platform/src/main/java/sorcer/core/dispatch/ExertionDispatcherFactory.java
	sos/sos-platform/src/main/java/sorcer/core/provider/SpaceTaker.java
	tools/sos-netlet/src/test/resources/f1.ntl