pull changes from master to dev on 2014-06-20

This update brings these approved pulls to the dev branch:
* User visible:
  * #1021: fix bug which showed players redundant initial die roll information after focus and chance actions

No database updates.

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.

Note: this pulls in the last of the code we're planning to load on the prod site on Sunday, so please test the dev site and tell us if anything is broken!