mvc
Merge branch 'routesview' into allie_partials