Merge branch 'master' into hotfix/2.1a35
Minor cookie code cleanup and verification.
Whitelist allowed filters in /user (s1).
Properly escape discussion name in dashboard summaries (s5).
Get stub IPLog tables out of master.
Merge branch 'master' of github.com:vanillaforums/Garden
Fix IP matching when a proxy is used.
Merge branch 'master' into hotfix/2.1a35
Merge branch 'hotfix/2.1a35' into develop

Conflicts:
	applications/dashboard/settings/class.hooks.php
	applications/vanilla/views/categories/helper_functions.php
	applications/vanilla/views/settings/managecategories.php
	index.php
	js/global.js
Merge branch 'develop' of github.com:vanillaforums/Garden into develop

Conflicts:
	applications/dashboard/settings/class.hooks.php
	applications/dashboard/settings/structure.php
	applications/vanilla/views/settings/managecategories.php
	index.php
	js/global.js