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

This update brings these approved pulls to the dev branch:
* User-visible:
    * #1473: fix a UI bug in which non-swing zero-sided or partially zero-sided dice were sometimes treated by the UI as swing dice

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.