citation merge
Merge branch 'master' of github.com:total-impact/total-impact-webapp

Conflicts:
	totalimpactwebapp/static/dist/Impactstory.js
	totalimpactwebapp/static/src/app/product-page/product-page.tpl.html