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