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
Changed behaviour of default attack when the only options are power and skill and there is fire assistance available: now, Power will always be selected
reggie rage, ZOEcon, Cowboy Bebop, others not yet in database
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
Morph (and doppelganger) now causes the attacker to lose its value, so that the new die will always have a newly rerolled value
Instead of explicitly specifying Power attacks for ambiguous Power/Skill fired attacks, use assert() to check that Power comes first
Merge pull request #1343 from ManvilleFog/138_button_images

reggie rage, ZOEcon, Cowboy Bebop, others not yet in database
Merge pull request #1346 from blackshadowshade/1345_morphing_reroll_on_successful_trip

Morphing trip now reroll after successful attack and morph
Removed unnecessary call by reference
Merge pull request #1337 from blackshadowshade/1334_default_fire

Default attack now handles power/skill choice with fire
Merge pull request #1358 from buttonmen-dev/master

pull changes from master to dev on 2014-10-15