styff
Merge remote-tracking branch 'origin/master'

Conflicts:
	youreffect/src/main/webapp/public/CostCalculator/index.html
	youreffect/src/main/webapp/public/assets/js/lib.js