Conflicts:
	framework/db/BaseActiveRecord.php

fixes #2254

Update console-fixture.md

Fixtures controller improvements

Allow multilevel dropdown.

moved magic methods

added total queries monitoring

Still needs an introduction and there are some questions to be
answered. Probably ought to demonstrate the code in an event handling
function.

renamed ActiveRecord::create() to populateRecord()

- refactored elasticsearch AR to make type and index available in
  instantiate(), issue #1313

fixes #2281

Convert database type to php

fixes #2276