bumped riak-pb and Jackson versions
Merge branch 'master' of github.com:basho/riak-java-client
Preparing for release

Updated various info files
[maven-release-plugin] prepare release riak-client-1.0.7
[maven-release-plugin] prepare for next development iteration
Merge branch 'master' of git://github.com/basho/riak-java-client

Conflicts:
	pom.xml
Merge branch 'master' into temetra-riak-java-client

Conflicts:
	pom.xml