AuthorSelector: Allow on Discussions.Edit instead of Moderation.Manage
Error Related to Delivery Type.

Open source community noticed a change in delivery type is causing "whoops error" when trying to delete files. 
Discussion: http://vanillaforums.org/discussion/comment/216330/#Comment_216330
Related to delivery type change here: https://github.com/vanilla/vanilla/commit/a69fa4048bd299d3248f0ff2897cde5e0ea93065
Mustache: initial commit, wip
Merge branch 'master' of github.com:vanilla/addons
CivilTongue: Add poll filtering.
Conflicts:
	plugins/CivilTongueEx/class.civiltongueex.plugin.php
CivilTongue: Add poll name to filtering.

Also optimize the error checking.
Merge pull request #144 from vanilla/hotfix/civiltongue-poll-filtering

CivilTongue: Adds filtering of Poll names and options.
Merge pull request #101 from vanilla/hotfix/authorselector-editpermission

AuthorSelector: Allow on Discussions.Edit instead of Moderation.Manage
Merge pull request #139 from adriansonline/patch-1

Error Related to Delivery Type.
Add/update some addon icons.
Merge branch 'master' of github.com:vanilla/addons
It's not you, it's cache
Merge branch 'master' into stage

Conflicts:
	plugins/CivilTongueEx/class.civiltongueex.plugin.php