cleanup
Merge branch 'api-rework' of https://github.com/dpgaspar/Flask-AppBuilder into api-rework