Merge branch 'release/2.2.0-beta1' into 2.2/master
Merge branch 'release/2.2.0-beta2' into 2.2/master
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/master
Merge branch '2.2/master' of github.com:pyrocms/pyrocms into 2.2/master
Update system/cms/modules/addons/details.php

Add class "modal" to "Upload" link for themes. So the upload form appears into a dialog, and not into a plain white page.
Merge pull request #2393 from tristanjahier/2.2/develop

Update system/cms/modules/addons/details.php
Updated wysiwyg config to remove protectedSource. This closes #2347
Fixing blog title in blog migration.
Fixing table padding on users table.
Merge branch '2.2/master' of github.com:pyrocms/pyrocms into 2.2/develop
Converting tags to entities for several text inputs where tags are not necessary.

For WYSIWYG and text area, the admin has a choice. We are setting that choice to n by default.
Setting textarea/wysiwyg parsing to no by default.

Puts the impetus on the admin to allow tags and makes more sense from that perspective.
Fixes #2394: BTREE screwing with MySQL installs below 5.0.5.
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Revert "Fixed hard/soft return in CKEditor"

This reverts commit a3fc6b31b8d262acdee0d29e8c8d01bf1490a27c.
Merge pull request #2409 from donaldallen/2.2/develop

Revert "Fixed hard/soft return in CKEditor"
Allows File upload to work if site not using mod_rewrite
Updating blog plugin for streams.

Now the blog plugin can take all of the parameters available to streams.

Closes #2406.
Sending any attributes to theme:partial will make them available in the view.
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop