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

This update brings these approved pulls to the dev branch:
* User-visible:
    * #1445: fix internal error bug with zero-sided swing dice
    * #1446: fix logging bug where the log wasn't showing swing values after berserk attacks before splitting
* Not user-visible:
    * #1438: more regression tests

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.