Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/master
Update system/cms/modules/blog/controllers/blog.php

add the category info to the blog category view
Update system/cms/modules/blog/controllers/blog.php

$category is an object and lex doesnt like it 
Update to tag handling in text fields.

The standard now for PyroCMS inputs is to store the raw tags in the database and sanitize on output. This is so we don't destroy the pure data.
Slugs now work again when creating Pages.

Fixes issue #2469.
Merge pull request #2470 from donaldallen/feature/PageSlugs

Slugs now work again when creating Pages.
Tagged v2.2.0-rc2
Merge branch 'release/v2.2.0-rc2' into 2.2/master
Fix "Array to string conversion" error in users/activate
Update system/cms/modules/blog/controllers/blog.php

changed to array type hinting 
Merge pull request #2481 from hdias/patch-1

Added category data to the blog category method
added the ability to clear out an image in the image field type
Merge pull request #2472 from smilledge/2.2/develop

Fix "Array to string conversion" error in users/activate
Fixes #2484: Added permissions for Page Types to avoid unexpected usage.
Fixes #2477: Updated country list.
This is clearly less than ideal, and we need to find a way to keep this up to date.
Fixing an issue with blog category pagination.
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Update system/cms/language/russian/buttons_lang.php
Update system/cms/language/russian/global_lang.php
Update system/cms/language/russian/admin_lang.php