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

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1436: fix corner case bug in which a player could reroll chance dice more than once
  * #1437: make action logging clearer in cases in which a die performs a radioactive attack and also some other size-changing action at the same time

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.