pull changes from master to dev on 2014-05-16

This update brings these approved pulls to the dev branch, so they can be tested on dev.buttonweavers.com:
* #843: fix bug affecting editing of chat with HTML-like tags in it
* #842: graphically display recently-captured dice

No database updates.