Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2
Remove the FormTitleWrapper from edit comment. This is supposed to be an inline view with no heading.
Promoted Content:
- Add the discussion type to the content.
- Add some event arguments.
- Throw the AfterBody event.
Make the Gdn_DataSet countable.
Conversations: Add some wraps to make theming more consistent.
EmbeddedComments: Not logged content fix.
Now when a logged out user clicks on the form it opens the login modal forcing the user to login before they type their comment.  Previously users were able to type content that would be lost in the login process.
Merge branch 'master' into release/2.2

Conflicts:
	applications/vanilla/controllers/class.postcontroller.php
	applications/vanilla/models/class.categorymodel.php
Make the menu sprites more general.
Remove CountBookmarks from the import.
Merge branch 'master' into release/2.2

Conflicts:
	index.php
Add some structure to get ready for the release.
Use GetValue() to check a category's photo to prevent php notices.
Make sure that when altering an index we drop and add the new one as two separate queries.
Merge branch 'master' into release/2.2
Make fields editable in UserModel//BeforeSave
Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2
Remove debug code.
Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2
Ignore .idea
Use an older version of jquery on category settings so that nested sortable will work.