Updated to protobuf 2.5
Added .gitignore for protobuf-2.5
Merge branch 'protobuf-2.5'