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

This update brings these approved pulls to the dev branch:
* User-visible:
  #1268: some more button art

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.