Merge branch 'remove-restful-flask'

# Conflicts:
#	deploy-prod.sh
#	deploy-test.sh
1 job for master in 51 seconds (queued for 1 second)