no message
Merge remote-tracking branch 'upstream/master' into container-extraction
documentation
Updated gadget area to remove unused code
Added jsdoc documentation for javascript methods
Merge branch 'master' of https://github.com/OpenSocial/explorer into jsdoc
syntax error fix
Merge pull request #59 from yangk/jsdoc

Jsdoc comments for javascript methods
Merge remote-tracking branch 'upstream/master' into container-extraction

Conflicts:
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/gadgetarea/GadgetArea.js
	opensocial-explorer-webcontent/src/test/javascript/gadgetarea/GadgetAreaTest.js
Merge remote-tracking branch 'upstream/master' into container-extraction

Conflicts:
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/gadgetarea/GadgetArea.js
Added JSDoc
Merge pull request #60 from ryanjbaxter/container-extraction

Extracting container from GadgetArea so it is more reusable
Fixes in the common container abstraction
Merge pull request #61 from ryanjbaxter/container-fixes

Fixes in the common container abstraction
- Added Google OAuth login
- Added Facebook OAuth login
- Fixed race condition bug in OpenID providers
- Refactored / abstracted out code related to OpenID/OAuth login
Merge branch 'master' of https://github.com/OpenSocial/explorer into openid-fixes

Conflicts:
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/MainContainer.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/gadgetarea/GadgetArea.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/openid/AuthProvider.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/openid/OpenIDLoginDialog.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/sidebar/CreationModalDialog.js

- Fixed all merge conflicts
- Added documentation comments