Merge branch 'master' of https://github.com/OpenNTF/SocialSDK into ActivityServiceJSFi
Line endings
Merge remote-tracking branch 'origin/master'

Conflicts:
	sdk/com.ibm.sbt.core/src/main/java/com/ibm/sbt/services/client/base/ConnectionsConstants.java
UPDATE: Added missing nls.feed entry
Changes to support OAuth 1 and 2.  Also includes changes to let gadgets
take advantage of OAuth from the Playground.
java unit tests for FileService, CMISFileService and ActivityService
Fixes for tags not being rendered correctly
Latest Changes
Merge pull request #1127 from DaviRyan/GridTagsFix

Grid tags fix
Merge pull request #1126 from VineetKanwal1/Branch_JavaUnitTests

Branch java unit tests
Merge branch 'master' of github.com:OpenNTF/SocialSDK into community-members-grid-lang
UPDATE: Removed trailing comma
Merge pull request #1125 from ryanjbaxter/oauth-support

Changes to support OAuth 1 and 2.
using temp file for test and added mock data
ignored test failing because can't generate smartcloud mock data
removed site from travis build
Merge pull request #1128 from LorenzoBoccaccia/master

Ignoring some tests to fix the build and general maintenance
IBM sample gadgets.
Merge pull request #1129 from ryanjbaxter/master

IBM sample gadgets
Fix xpath issues in internet explorer.