Bump versions of everything to support protobuf 2.5.0.
Merge branch 'hotfix/updateprotobuf'
Merge branch 'master' into develop

Conflicts:
	java/amqp-api/pom.xml
	java/amqp-samples/pom.xml
	java/pom.xml
	java/protobufs/pom.xml