Merge branch '2.2/develop' of github.com:pyrocms/pyrocms into feature/custom-page-fields
Renamed lang files in pages module
fixed the thumbnail issue in right section of file manager
revert changes
Reworked page layouts into Page Types. Added stream logic
Added ability to set file 'alt' attribute on image upload
file replace support for files module admin
maxfiles reset on cancel
Update system/cms/language/dutch/global_lang.php
Merge pull request #2001 from pvdl/patch-1

Update system/cms/language/dutch/global_lang.php
Merge remote-tracking branch 'upstream/2.1/develop' into 2.1/develop
Added third argument for order_by to allow disabling auto escaping for custom string sorting
Added migration to add alt attribute column to default_files table
fixed goofs in migration
Switching to Jerel's improved syntax for alpha_dot_slash fix.
Merge pull request #1994 from bezalelinc/patch-1

Update system/cms/modules/wysiwyg/views/files/index.php
Merge remote-tracking branch 'upstream/2.1/develop' into 2.1/develop
Added sort direction back
Choices Multiselect Clean commit.

I swear !
RESET