moved $where search update before DB quering
moved $count after DB and file results merge
Fix workspace errors breaking the package management layout by displaying them in ExtJS
Delete now unneeded tpl
Prevent Reports menu item from navigating to non-existant action
Re-introduce MODx.action variable in manager to provide BC for actions
bug - processors properties overwrite

(cherry picked from commit c5d7aec9fc340200f8eaf866e919f0984f55f74c)
new modDeprecatedProcessor properties

(cherry picked from commit e1c0ee2dde58260b4353e5d52c300827728d75a3)
Prevent processor property overwriting in modX::runProcessor()

add changelog
Prevent processor property overwriting in modX::runProcessor()

Merge branch 'pr/682' into develop

* pr/682:
  Prevent processor property overwriting in modX::runProcessor()
  new modDeprecatedProcessor properties
  bug - processors properties overwrite
Fix xPDO->parseBindings bug triggering modDbRegisterMessage errors

Closes modxcms/revolution#785
Closes modxcms/xpdo#27

Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Resolve xPDO::parseBindings() error from /e modifier fix
Fix deprecated returnValue to prevent confirm navigation alert

(cherry picked from commit 0b026e65c43c3dc025bdc3b177c06539d2b04ea7)
Confirm navigation when unsaved changes exist in resource panel

Merge remote-tracking branch 'origin/pr/782' into develop

* origin/pr/782:
  Prevent navigation if there are unsaved changes on the resource panel
Stripping query string from REQUEST_URI

Stripping query string from REQUEST_URI when comparing to base_url.
Extending #458 'open in new window' feature with optional Shift modifier. Shift + click in resource tree to edit in new window for users with no middle mouse button (e.g. Apple magic mouse, trackpads, etc)
Updated processor instantiation
Add note about grunt not found
Prevent content duplication when using [css|js|html]To[Head|Bottom] output filters that call modX.regClient*
[REBUILD] Allow disabling the confirm navigation popup

(cherry picked from commit 4f8ae7293230bca9a7a29fa3dc828a40532ef263)

Conflicts:
	manager/assets/modext/widgets/resource/modx.panel.resource.js
Improved "prevent navigation" alert by tracking field changes instead of using flawed isDirty() check.

The FormPanel.isDirty() check does a raw comparison between the original value and the current value of each of the fields. When using a rich text editor, there could be changes in the current content value of a resource due to changes in formatting (editors forcing a <p> root block) or encoding (& being turned into &amp;) which would result in the navigation popup. While yes, there are changes, no, the user did not make them so they should not be bothered with a popup.

The commit changes from looking at FormPanel.isDirty() to tracking field changes through the changeField event and a local flag.

This commit also resolves an issue where changing templates would show the warning during the reload.

(cherry picked from commit 5f24bb7fa025e4ae9c07d903e13d1c53b0c2fd41)

Conflicts:
	manager/assets/modext/widgets/resource/modx.panel.resource.js