Upgrade protobuf to 2.6.1.
Merge pull request #170 from m1ch1/master

right protobuf-java version?