Reordered columns in die table to match dev/prod
Added logic to stop trip dice morphing after an unsuccessful attack
Added die flag for unsuccessful attacker
Merge pull request #1330 from blackshadowshade/1298_table_column_order

Reordered columns in die table to match dev/prod
Merge pull request #1333 from blackshadowshade/802_morph_on_unsuccessful_trip

Morphing dice now do not morph after unsuccessful trip attack
* add a regression test for attacks by morphing trip dice
Merge pull request #1344 from cgolubi1/morphing_trip_test

add a regression test for attacks by morphing trip dice