Admin panel - order details added
Merge conflict public/app/app.js
Merge branch 'master' of https://github.com/NodeJS-Team-Anemoi/TeamworkProject