Merge branch 'master' into downloadPanel_style

Conflicts:
	src/test/javascript/portal/cart/AodaacDataRowTemplateSpec.js
	web-app/js/portal/cart/AodaacDataRowTemplate.js