pull changes from master to dev on 2014-11-19

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1391: explicitly show a morphing step in the action log even when the attacker stays the same size
  * #1392: put defender recipe change before reroll in action log for trip attacks
  * #1397: button art for more fanatics and for Cesare
  * #1354: add Kublacon, Cowboy Bebop, ZOECon, 50 States, Blade Masters, Megatokyo, and Order of the Dolls buttons to DB
* Not user-visible:
  * #1410, #1413: fix the success message for the API loadGameData method

Database updates:
```
01329_remaining_button_sets.sql
```

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.