UI for uploading images for product
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/scripts/product/controller_product.js
	src/main/webapp/views/partials/product-view.html
UI for uploading images for product