First version that compiles
Merge branch 'master' of https://github.com/feshie/protocol-buffers

Conflicts:
	.gitignore