Minor version bump, adding support for XML data formats
master only builds against 2.10.x
disentangled some of the resolver names as per sbt/ivy warning
Merge remote-tracking branch 'origin/master' into scala-2.9.x

Conflicts:
	project/build.scala