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
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
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 #827 from buttonmen-dev/master

pull changes from master to dev on 2014-05-03