Changed action logging to put defender recipe change before reroll on trip attack
Merge branch 'master' into 1332_mood_log

Manually resolved conflicts in:
	test/src/engine/BMGameActionTest.php
Merge branch 'master' into 1332_mood_log

Manually resolved conflicts in:
	test/src/engine/BMGameActionTest.php
Merge pull request #1392 from blackshadowshade/1332_mood_log

Changed action logging to put defender recipe change before reroll