Upgrade to 3.1.0
Upgrade to 3.1.0.M1
Merge branch 'gds310'

Conflicts:
	client-air/pom.xml
	client-flex/pom.xml
	client-java/pom.xml
	client-javafx/pom.xml
	pom.xml
	server-cdi/pom.xml
	server-ejb/pom.xml
	server-spring/pom.xml
Upgrade to 3.1.0.M1