Moved preferences dialog to main container
Merge remote-tracking branch 'upstream/master' into move-preferences-widget-out-of-toolbar

Conflicts:
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/login/LoginDialog.js
Merge remote-tracking branch 'upstream/master' into move-preferences-widget-out-of-toolbar

Conflicts:
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/gadgetarea/GadgetArea.js
Merge pull request #77 from ryanjbaxter/move-preferences-widget-out-of-toolbar

Move preferences widget out of toolbar