pull changes from master to dev on 2014-10-28

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1373: fix a bug affecting Skomp vs. Loki
* Not user-visible:
  * #1371: change to UI unit tests 

Database updates: none

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.