update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/scripts/controllers/backoffice.js
	app/views/index.html
	app/views/partials/bo/product/list.html
	test/spec/services/imagesFactory.js
HP / New stock prototyping