Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/views/products/builder-options.html
Merge remote-tracking branch 'origin/develop' into develop