Merge branch 'master' of github.com:vanilla/addons into stage

Conflicts:
	plugins/Quotes/class.quotes.plugin.php
Merge branch 'master' into stage
Merge branch 'stage' of github.com:vanilla/addons into stage
CivilTongueEx: Add the profile reaction pages to civil tongue.
Merge branch 'stage' of github.com:vanilla/addons into stage