Conflicts:
	src/google/protobuf/extension_set.h

Fix for https://github.com/google/protobuf/issues/758

Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724

Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3

Move StringSpaceUsedIncludingSelf to lite library.

Remove a static initializer by removing a global of non-POD type.

Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error

Delete kNanosPerSecond from time.cc.

These are banned by the Google style guide, and Chromium has a hard
no-new-static-initializers policy preventing updating to a new version of
libprotobuf unless this is resolved.  This is the first such change, I'll need
to make at least one more in the future.

Luckily, the protobuf source tree already has an alternative to static
initializers in once.h; use that machinery instead.

I defined everything in the .cc file in a blob to replace the old implementation
rather than matching the .h layout precisely; let me know if a different
ordering is preferred.  I also eliminated the macro that used to be used here as
spelling everything out only takes one additional line, and the macro didn't
actually handle all details of using a particular member variable, just the
declaration, so it felt a bit error-prone.

Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}

Avoid #including system headers from inside a namespace.

This came up because Chromium downstream modifies the lite library in a way that
requires this function, but I'm upstreaming it because based on the comments in
repeated_field.h, this ought to allow resolution of an existing hack.

I don't know enough about the protobuf code to feel confident trying to resolve
this hack myself, so I've merely updated the TODO comments.

Fix javadoc errors.

This variable is unused, and thus triggers a build warning on MSVC.

port.h #includes various headers in order to define byteswap functions, but it
currently does so from inside the google::protobuf namespace.  This can cause
bizarre symbol conflicts and other build errors as these headers' contents are
then included inside this namespace.

Instead, #include the relevant headers above the namespace declarations.

Fix Protobuf.podspec

Excludes a failing python cpp test case.

Add distribution for objc

Add bazel build/workspace into distribution.

Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21

Update change log for beta-1.

Fix bugs for objectivec

Get all tests passing on Python3 (except Python3.4 cpp implementation)

vsproject files no longer exist.

Update version number.

Update README.md for C#