contrib: Added feross/buffer.js
browserify: Change to use the Buffer class from contrib/feross/buffer.js.
Merge branch 'master' into feross to include the latest changes to use get/set methods instead of object fields.
browserify: Remove line ending whitespace.
Remove trailing whitespace. Refs #1704.
Merge changes from the master branch to remove trailing whitespace. Refs #1704. http://redmine.named-data.net/issues/1704
Recompile after merging from master to remove trailing whitespace. Refs #1704.
merge changes from master into feross branch.
Merge branch 'master' into feross after fixing bug 1617 Second call to expressInterest gives "connection not established".

Conflicts:
	ndn-protocol.xpi
Merge branch 'master' into feross to bring in Name.Component.toSegment and toVersion.
Merge branch 'master' into feross to get the pull request for TlvDecoder.readExtendedVarNumber
Merge branch 'master' into feross including security API code including KeyChain. This moves
the work of sign and verify to MemoryPrivateKeyStorage and SelfVerifyPolicyManager.
Merge branch 'master' into feross to remove the incorrect comment from the new security files.
Merge branch 'master' into feross for renaming the Signature class to Sha256WithRsaSignature.

Conflicts:
	ndn-protocol.xpi
Merge branch 'master' into feross to get the pull
request "declare var firstOctet to avoid global leak". Also pull in
support for getChangeCount in some classes.

Conflicts:
	build/ndn.js
	build/ndn.min.js
Merge branch 'master' into feross to get the change request
"in face.reconnectAndExpressInterest : add check for face.readyStatus".
Also merge the support in Face for removePendingInterest and removeRegisteredPrefix."
Merge pull request #39 from felixrabe/patch-2

js/face.js indentation: Remove bad nbsp char
ForwardingFlags: Move the internal definition of ACTIVE, CHILD_INHERIT, etc. from ForwardingEntry to ForwardingFlags.
Face (internal): Make registerPrefixWithClosure and dependent functions use a ForwardingFlags object instead of a number for the flags.
ForwardingFlags: Added get/setNfdForwardingFlags.