pull changes from master to dev on 2014-08-24

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1227: implement ornery die skill
  * #1236: fix a "doubled-footer" bug in the gameplay UI when it's your opponent's turn

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.