Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
Add page chunk button (was missing in action)
added cache delete and page type update event to the sync method
Putting this elsewhere

This way this form EXACT view can be pulled into forms and what not for awesomeness.
Hide the form

Oops
Offset was only offsetting the page number
Offset is (page_num - 1) * per_page

Only subtract the 1 if not the first page. Otherwise page 1 would show entries 11 - 20.
Update CKEditor to 3.6.6
Fix images not been displayed in the editor iframe and in the preview window of the Image dialog.
Disable the URL field in the Image dialog so it can't be changed.
Making the country function in the country ft public.

So developers can access it and use the array it returns. 
little cleanup.
Merge pull request #2216 from dresfdez/feature/ckeditor-update

Feature/ckeditor update
Merge pull request #2207 from hdias/sync_page_types_files

added cache delete and page type update event to the sync method
Adding ckeditor4 and Updated 2.2 base to fix conflicts
accidental file inclusion
Merge pull request #2217 from ryun/feature-ckeditor4

Update to ckeditor 4 and Updated local 2.2 base to fix conflicts
Ckeditor4

fixed issues causing editor to break the layout

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
CKEditor base z-index

Fixes any issues with #2221