Merge remote-tracking branch 'Upstream/master' into opensocial-domino-plugins
Sample to demonstrate functions in widget base class
Follow service resources
Add some new properties to SmartCloud OAuth 2.0 Endpoint to simplify the
configuration
classpath
Merge remote-tracking branch 'origin/master'

Conflicts:
	samples/com.ibm.sbt.samples.commons/.classpath
Fix duplicate entry
Unit Test to check functions in the Widget Base Class
Documentation
Add new test to this set of tests
Testcase for Follow service
Merge pull request #1057 from ManishKataria/FollowService

Follow service resources
Merge pull request #1062 from ManishKataria/TestCasesFollowService

Testcase for Follow service
Simplify the configuration of SmartCloud OAuth 1.0. 
Propogate cause when there is a problem reauthenticating when using SSO.
Merge pull request #1059 from markewallace/OAuth2Endpoint

SmartCloud OAuth2.0 Endpoint Enhancements
Merge pull request #1014 from ryanjbaxter/opensocial-domino-plugins

OpenSocial domino plugins and build changes
Serialization changes
Merge pull request #1060 from LorenzoBoccaccia/plain-build

Fix for non domino builds
Fixes for the build/nModify package.json/nAdd _config.js
Merge remote-tracking branch 'origin/master'