Questions Changes
Merge branch 'master' into Daniel
Fixed Add Products Functionality
Products
Merge branch 'Daniel' into Henry

Conflicts:
	assets/frontend/js/app.js
Updated app.js to match Daniel's branch
Added pending products to sidebar in admin
Ignore config file