pull changes from master to dev on 2014-07-23

This update brings these approved pulls to the dev branch:
* #1127: more button art
* #1126: "The Frenchman" button name fix
* #1114: fire skill

Database updates:
```
01086_frenchman_fix.sql
```

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.