Catalog module added. Orders fixes.
Merge conflict ordersController.js
Merge branch 'master' of https://github.com/NodeJS-Team-Anemoi/TeamworkProject
Orders resource fixed.