Changed activity log for attacks to fix order for trip attacks and morphing attacks
Altered unit tests to match new action log logic
Merge remote-tracking branch 'upstream/master' into 731_781_activity_order

Manually resolved conflicts in:
	src/engine/BMGameAction.php
	test/src/engine/BMGameActionTest.php
Fixed resulting bugs in:
	src/engine/BMGameAction.php
	test/src/engine/BMGameActionTest.php
Fixed checkstyle warning
Fixed invalid MySQL syntax on update 00202_prev_swing_01.sql
Removed wait message for swing and chance/focus
Merge pull request #805 from blackshadowshade/731_781_activity_order

Fixed activity log for trip and morphing attacks.
Fixed grammar
Merge pull request #821 from AdmiralJota/819_grammar_fix

Fixed grammar in disabled die title text
Show previous swing/option values
Fixed option request array bug when there are multiple option dice with identical recipes
Merge pull request #825 from blackshadowshade/824_identical_option_select_bug

Fixed option request array bug when there are multiple option dice with identical recipes
Merge pull request #815 from blackshadowshade/814_invalid_sql

Fixed invalid MySQL syntax on update 00202_prev_swing_01.sql
Merge pull request #816 from blackshadowshade/713_swing_wait_message

Removed wait message for swing and chance/focus
Merge pull request #823 from AdmiralJota/202_show_previous_swing_value

Show previous swing/option values