Merge branch 'crit-shrugoff-fix' of...

Merge branch 'crit-shrugoff-fix' of http://git.net-core.org/grayswandir/t-engine4 into grayswandir/t-engine4-crit-shrugoff-fix

Conflicts:
	game/modules/tome/data/damage_types.lua