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

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1384: doppelganger and morphing dice now gain swing/option when they target swing and option dice
  * #1422: improvements to radioactive description
  * #1428: radioactive action logging is clearer in the case of mighty/weak radioactive attacks
* Not user-visible:
  * #1425, #1427: miscellaneous test/jenkins changes
  * #1424: fix whitespace in some new button recipes

Database updates:
```
01423_recipe_whitespace.sql
```

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.