update protocolbuf
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/popcorn.proto
Merge pull request #2 from georgeye/master

fix interface issu.e