Merge branch 'master' of https://github.com/rollandlee/Hermes

Conflicts:
	api/controllers/Order.php
	api/controllers/Product.php
	css/main.css
	js/app/router.js