add new API framework to requirements.txt
Merge branch 'master' into yelles_branch

Conflicts:
	app/static/js/milo.js
Merged Alex's branch with master