add oneof according to protobuf 2.6.0
Merge pull request #7 from AoJ/oneof

add oneof according to protobuf 2.6.0