fixed search event and added some fixes
Merge branch 'master' of github.com:Ortus-Solutions/ContentBox into development
fixed #241
Do not allow to set yourself as your own parent page
upgrade complete
oopsy on the upgrade
Merge branch 'feature/ckeditor4' into development
fixes to events for editor services
upgraded to latest uploadify
fixes to the wordpress importer since it doesn't work on Railo & didn't support the latest changes to Coldbox :-D
Merge pull request #56 from lunarfly/development

fixes to the wordpress importer since it doesn't work on Railo & didn't ...
New menu type for buildMenu = data

Allow the buildMenu function to accept a type of data that returns
an array of structures of the menu for the developer to then build
there own menu around.
Added separator on subsequent calls
Updated widget managment/insertion to handle module and layout widgets

Updated services in admin to allow for management of module/layout
widgets in the same way as core widgets (edit/view documentation).
Updated content editor views to allow for insertion of module/layout
widgets into content editor
Updated CBHelper to allow devs to use same syntax cbhelper.widget() for
including module widgets (layout widgets were already supported)
Merge pull request #57 from gratzc/patch-1

New menu type for buildMenu = data
Merge pull request #58 from engens/patch-1

Added separator on subsequent calls
cleanup
Merge branch 'development' of github.com:Ortus-Solutions/ContentBox into development
fix for stupid cf9 bug
updated locations to be more generic.
Updated to leave "update" as default for ORM