Merge pull request #116 from chen3feng/develop

Regenerate zip after merge
fix warnings that "dir not in version control" and generate version.cpp with commit log when using git,rather than svn.
Merge pull request #110 from vonnyfly/master

fix warnings that "dir not in version control" and generate version.cpp ...
fix sed no -r option on mac
Merge pull request #121 from brianli/master

fix sed no -r option on mac
Fix bug of proto_library deps proto_library
Update zip
Merge between internal and opensource version