put mock flags into main controller. fixed app.yaml routing
Merge remote-tracking branch 'origin/master'