added service modal, added to explore.html, renamed some files
Merge branch 'master' of https://github.com/yangk/explorer into services
OAuth1 UI
Merge branch 'master' of https://github.com/yangk/explorer into services

Conflicts:
	opensocial-explorer-webcontent/src/main/javascript/modules/main.js
	opensocial-explorer-webcontent/src/main/javascript/modules/templates/MainContainer.html
	opensocial-explorer-webcontent/src/main/javascript/modules/templates/SidebarNav.html
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/ExplorerContainer.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/MainContainer.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/SidebarNav.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/creation/CreationSpecModal.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/gadgetarea/GadgetArea.js
	opensocial-explorer-webcontent/src/test/javascript/CreationSpecModalTest.js
	opensocial-explorer-webcontent/src/test/javascript/ExplorerContainerTest.js
	opensocial-explorer-webcontent/src/test/javascript/SidebarNavTest.js
Merge branch 'master' of https://github.com/yangk/explorer into services
updated ui
Added new servlet
Merge branch 'master' of https://github.com/OpenSocial/explorer into services

Conflicts:
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/ExplorerContainer.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/SidebarNav.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/gadgetarea/GadgetArea.js
	opensocial-explorer-webcontent/src/test/javascript/ExplorerContainerTest.js
	opensocial-explorer-webcontent/src/test/javascript/SidebarNavTest.js
working oauth1 service
changed service remove button and fixed up index page
Renamed dialogs to modals for consistency
Finished tests
Merge branch 'master' of https://github.com/OpenSocial/explorer into services

Conflicts:
	opensocial-explorer-webcontent/src/main/javascript/modules/ExplorerContainer.js
	opensocial-explorer-webcontent/src/main/javascript/modules/templates/GadgetToolbar.html
	opensocial-explorer-webcontent/src/main/javascript/modules/templates/MainContainer.html
	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/gadgetarea/GadgetToolbar.js
	opensocial-explorer-webcontent/src/main/javascript/modules/widgets/login/LoginModal.js
	opensocial-explorer-webcontent/src/test/javascript/gadgetarea/GadgetAreaTest.js
	opensocial-explorer-webcontent/src/test/javascript/login/LoginModalTest.js
minor bug fix
Removed app info
Fixed test failures
Code review fixes
fixed spacing, removed oauthstore getter method, fixed tests
error messages updated and using "hide" css class
clear fields upon submission, added license