Don't throw you are already registered error in the user model. This needs to be done in the controller.
Don't trace false values.
Add an id to the comment form so that js can target it.
Set the location hash after the page has loaded to prevent some scroll jumping.
Make ProxyRequest compatible with latest cURL.
Merge branch 'master' into release/2.2

Conflicts:
	applications/vanilla/views/discussions/table.php
	index.php
	library/core/class.proxyrequest.php
Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2
Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2
Merge/Split: New split topic is now always a topic.
A customer complained about the wonky functionality of splitting a question and it becoming another question instead of a discussion.  Makes sense for a split to always be a discussion.
Show preferences rather than profile/edit when profile edit has been disabled.
Fix bug in RoleModel->GetPermissions().
Allow a title to be passed to UserAnchor().
Add a few more fields to the user filter.
Add ExtendedFields to Roles
Fix bug where mention headline would be used for adv notifications
Add ExtendedFields to Roles
Fix bug where mention headline would be used for adv notifications
Pass comment activity array to events
Pass comment activity array to events
Fix sidemenu CheckPermissions to be 'OR' not 'AND'