Merge branch 'OCF37-change-development-flask-server-to-production-server' into 'staging'

Ocf37 change development flask server to production server (after some new changes in staging)

See merge request !36