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

# Conflicts:
#	src/main/resources/static/js/product/list.js
#	src/main/resources/static/js/product/produce-list.js