Update version
Merge branch 'master' of https://github.com/socrata/soda-java

Conflicts:
	pom.xml