first updates for converting edit page to query
Small textual update to column1 descriptions.
Updated version to 4.2.0 for update to jQuery on Page editing
Adding 4 column layout and variable for indicating layout type in layout parent class
Add setting for showing part of the available layouts based on new templateType
Refactored page editing to jQuery UI portlet for drag&drop of content items

Much more robust and future proof then the old widget portal. Gives a good cleanup of the page editing code.
Merge branch 'refs/heads/master-jquery-convert'

This update will bring the jQuery page editing update into the master branch