Conflicts:
	flask_admin/model/base.py

Inline view fix

Named url filters

This reverts commit c424c3fe.

This reverts commit 749161e7.

This reverts commit deb60c15.

Old format fltN_M still works, but the new format flt_name_operation coexists side-by-side.

Fix compat for CPython/PyPy 2.x

Support both __builtins__ as a dictionary and a module.

Allow custom _id value type in mongoengine backend

Display foreign keys when explicitly instructed

__builtins__ should be accessed as a module, not a dict.

More examples