Fix D in productivity damages
Switch from PRTP to SRTP in SCC
Switch from PRTP to SRTP in SCC
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	webdice/dice.py
	webdice/equations/damages.py
	webdice/params.py