Update code docs, fix invalid constant
Disable phpdoc generation in build for now
Make settings and user top menus go directly to actions, and fix logout.
Update Brazilian Portuguese lexicon topics

Merge remote-tracking branch 'origin/pr/613' into release-2.2

* origin/pr/613:
  Minor bug fixes
  Fixed bugs and updated language file
Update Italian lexicon topics

Merge remote-tracking branch 'origin/pr/614' into release-2.2

* origin/pr/614:
  italian lexicon for modx 2.2.10
  Update file.inc.php
  Update setting.inc.php
Update Dutch lexicon topics

Merge remote-tracking branch 'origin/pr/617' into release-2.2

* origin/pr/617:
  Updated Dutch lexicons for 2.2.10
[#9973] Prevent extended user classes being set to modUser

Merge remote-tracking branch 'origin/pr/616' into release-2.2

* origin/pr/616:
  Update update.class.php
Fixed inline add button in tree

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

* origin/pr/619:
  Fixed inline category button. Now it shows add window
  Fixed inline add button in tree
Bump version for 2.3.0-alpha development
Add dependency metadata/methods to xPDOTransport

Provides baseline support for dependency metadata to be specified and tested against version constraints
Add changelog entry
Added tooltips to inline buttons
Remove console log call
Add dependency metadata/API to xPDOTransport

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

* origin/pr/16:
  Add changelog entry
  Add dependency metadata/methods to xPDOTransport
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Add changelog entry
  Add dependency metadata/methods to xPDOTransport
  Bump version for 2.3.0-alpha development
  Disable phpdoc generation in build for now
  Update code docs, fix invalid constant
Fixed creating/updating system settings. Fixed searching empty string.
Fix js error on MODx.Console.close()

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

* origin/pr/610:
  bugfix:  modx.console, js error on close
Fix js error on MODx.Console.close()

bugfix:  modx.console, js error on close

(cherry picked from commit 06e1b1ffa17afe83c93bd289c3b1dffe9d193f4e)
Merge branch 'release-2.2' into develop

* release-2.2:
  Fix js error on MODx.Console.close()
  Minor bug fixes
  Updated Dutch lexicons for 2.2.10
  Update update.class.php
  italian lexicon for modx 2.2.10
  Update file.inc.php
  Update setting.inc.php
  Fixed bugs and updated language file
  French translation by @ackwa
  Updated and fixed some of the Brazilian Portuguese translation files.
  Update Japanese lexicon topics
  Updated encoding for Brazilian Portuguese lexicon files
  Updating the lexicon files for Brazilian Portuguese
  Add a README.md
  Update German lexicon topics

Conflicts:
	core/docs/changelog.txt
	core/lexicon/ja/namespace.inc.php
	core/lexicon/ja/propertyset.inc.php
Added tooltips to inline buttons

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

* origin/pr/621:
  Remove console log call
  Added tooltips to inline buttons