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

This update brings these approved pulls to the dev branch, so they can be tested on dev.buttonweavers.com:
* Updates which should be visible to players:
  * #749, #807: option die type backend and UI
  * #774: mood skill
  * #810: more button art
* Updates which should not be visible to players:
  * #808: backend of making swing and option values from previous round available to players (but not UI)

Database updates in this pull:
```
00093_option_01.sql
00090_mood_swing_01.sql
00202_prev_swing_01.sql
```