Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Fixed setting validation.
Merge branch '2.2/develop' of git://github.com/pyrocms/pyrocms into 2.2/develop
Fixed issue #2205: Editing navigation links had no content.
The dark background bled over the input all nasty
Fixes issue #2242, only images with Lex tags will disable the URL field of the Image dialog
Merge pull request #2245 from dresfdez/hotfix/2242

Fixes issue #2242, only images with Lex tags will disable the URL field ...
Fix for issue #2240 - pages with no fields can now be edited and saved
Hide the admin header when ckeditor is maximized to avoid overlapping and also toggle the maximize icon to pyrocms logo cause it looks cool.
Merge pull request #2246 from obrignoni/2.2/ckeditor-maximize

Hide the admin header when ckeditor is maximized to avoid overlapping an...
Typo, default_vlaue -> default_value
Add recursive function to allow has_current navigation links to be found in any level of navigation
nav section title in button. button red and angry.
Merge pull request #2250 from james2doyle/feature/new-nav-remove-btn

nav section title in delete button. button red and angry.
Profile id is not always the same as user_id

This fixes a bug with unique fields not validating correctly when the profile id and the user id go out of sync.
Fixing issue where unique validation fails if profile id != user id
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Fix Add Link in navigation module