trivial
tirvial
trivialMerge branch 'master' of https://github.com/xiechao06/Flask-DataBrowser

Conflicts:
	flask_databrowser/base.py
	flask_databrowser/example/__main__.py