package.json moving devDependencies to dependencies
Merge branch 'master' of github.com:beeman/loopback-angular-admin
Implements decent Product system
Implements decent Product system
Update product system
Merge branch 'master' into AdminLTE

Conflicts:
	client/app/views/categories/main.html
	client/app/views/products/main.html
Catch 404 errors
Fix resolving of category in product view
Fix jshint warnings in imported code