- hack: spring-cloud also accepts upsi
- version bump to 0.97
Merge branch 'master' of https://github.com/thisismana/spring-cloud

Conflicts:
	cloudfoundry-connector/pom.xml
	core/pom.xml
	parent/pom.xml
	pom.xml
	spring-service-connector/pom.xml