Summary and new formulas
Fix src

Conflicts:
	js/settings.js
	js/views/AttackSetupView.js