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

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1333, #1344: morphing dice don't morph after unsuccessful trip attack
  * #1346: bugfix: morphing dice reroll after successful trip-and-morph, rather than using the defender's reroll value from the trip attack
  * #1343: more button art
  * #1337: make default attack possible in case of power/skill fire-assisted one-on-one attacks
* Ideally not user-visible:
  * #1330: die table on test sites should match dev/prod column order

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.