flights update of models, views and templates
merge conflict with appView