Fix version number of FeedDiscussions plugin.
Merge branch 'master' of github.com:vanillaforums/Addons
Add 'Question' class to discussions that are questions
Merge branch 'master' of github.com:vanillaforums/Addons
Saner classes for NewQuestionModule
Merge branch 'master' of github.com:vanillaforums/Addons
JsConnect:
- Added editable Trusted parameter to jsConnections.
- Added JsSSOString() to the jsConnect functions.
CategoryCollapser appears
Merge branch 'master' of github.com:vanillaforums/Addons
Restrict CategoryCollapser to h2
Restrict CategoryCollapser to h2
CategoryCollapser 1.0.1
ShareThis: Add classes for CSS targetting, remove inline CSS
ShareThis updated buttons
FileUpload:
- Fix for changed content-type of application/json for the file upload's json iframe.
Merge branch 'master' of github.com:vanillaforums/Addons
ShareThis backwards-comp formatting
Merge branch 'master' of github.com:vanillaforums/Addons
Change example plugin's permissions.
Merge branch 'master' into develop

Conflicts:
	plugins/FeedDiscussions/class.feeddiscussions.plugin.php