Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Fix bug where activation email sent upon registration even when Setting is "No activation"
Merge branch '2.2/develop' of github.com:khalil-tabbal/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Bugfix Comments: unknown index 'user_id'
While adding a comment as a guest we have no 'user_id' index,
This juts adds a couple extra `isset()` checks.
Blog: Moved permission checks for optimization

Moved the `role_or_die()` checks to the top of the methods for optimization.
Why not save a few cycles..
Changes to the e-mail
removed upload-directory from gitignore
Added padding to description
Merge pull request #2608 from ryun/patch-3

Blog: Moved permission checks for optimization
Merge pull request #2607 from ryun/2.2/dev-comments-bug

Bugfix Comments: unknown index 'user_id'
Fixes #2604. Plugin docs did not allow an integer value of 0 as default value
Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into 2.2/develop
Fixes #2591. Email line endings now has a gui setting. Defaults to \r\n as per specs
Fixes #2603. Chinese and English translations for Variables help was transposed
Fixed a bug with default attributes in {{ blog:posts }}
Fixes #2599. Removed the default limit of 10 from pages, files, and blog. Unlimited
now unless specified which is the expected behavior
Fixes #2596. Parse the blog's rss feed in case Lex tags are used in intro.
Merge branch '2.2/develop' of git://github.com/swanback/pyrocms into 2.2/develop