trivial
trivial
Merge remote-tracking branch 'origin/issue145'

Conflicts:
	flask_databrowser/base.py
	flask_databrowser/example/__main__.py
	flask_databrowser/templates/__data_browser__/macro.html