Altered options field in the settings table to allow for larger option strings
Merge branch '2.2/develop' into feature/extend-settings-options
Bumped migration number up to #127
Fixed CKEditor moono-dark theme width in Safari
fixed vertical alignment of "+" on admin shortcut buttons
Merge pull request #2715 from mattpotts/patch-1

fixed vertical alignment of "+" on admin shortcut buttons
Merge pull request #2714 from jchamberlain/2.2/develop

Fixed CKEditor moono-dark theme width in Safari
After delete, show message in files manager on error, not just success
forgot to remove old migration
Changed options field type for installer
Merge pull request #2711 from ryun/feature/extend-settings-options

Altered options field in the settings table to allow for larger option strings
Fixing issue with editing stream relationship fields

Not the actual relationship, but the field instance itself.
Drastically improved speed on large paginated stream results.
Small blog language fix.
Validate input type in choices field

This just sets a default input type (dropdown) if there is no input
type (or an invalid one) set for the choices field type.

Addresses #2721.
Fixing name variable issue with admin user preview

This was relying on first_name and last_name.

Fixes #2718.
Merge pull request #2716 from jchamberlain/2.2/develop

After delete, show message in files manager on error, not just success
Fixing missing recaptcha config load.

Fixes #2712.
Don't add the js/css files for the image ft multiple times.
Merge git://github.com/pyrocms/pyrocms into 2.2/develop