fix storage api
Merge branch 'master' into nicebotmerge

Conflicts:
	app.py