Fixed the blog RSS controller
Complete polish translation for Files module
Update files_lang.php

white space
Update index.php

I suggest :)
Merge pull request #3234 from JARVIZX/patch-2

Update index.php
Merge pull request #3233 from JARVIZX/patch-1

Update files_lang.php
Merge branch '2.3/develop' of https://github.com/berbecki/pyrocms into berbecki-2.3/develop

Conflicts:
	system/cms/modules/files/details.php
Merge branch '2.3/develop' of git://github.com/pyrocms/pyrocms into 2.3/develop
Merge branch 'feature/blog-rss-fix' of https://github.com/MatissJA/pyrocms into MatissJA-feature/blog-rss-fix
Make Blog RSS work with new PSR-0 models.
Fix blog categories pagination #3237
Fix blog sitemap
goodbye blog CI models
Don't be stupid AND don't default to HTM
Merge branch 'refs/heads/3.0/develop' into AIWS/production
Get user id from the profile id that is passed
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/blog/views/admin/categories/index.php
Merge branch 'refs/heads/3.0/develop' into AIWS/production