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

This update brings these approved pulls to the dev branch, so they can be tested on dev.buttonweavers.com:
* User-visible changes: 
  * #823: when setting swing dice, show the value from the previous round
  * #816: stop telling users to wait for opponent to do things, since the section title already says this
* Changes that shouldn't be user-visible:
  * #815: fixed SQL update file we'll need when we next pull to prod
  * #786: add die flagging mechanism to be used later in indicating which dice have just been captured

Database update:
```
00193_add_flags_01.sql
```