integration of flask routes with frontend
Merge remote-tracking branch 'origin/david/master' into arturo/master