Catalog view added.
Merge conflict public/app/app.js