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

This update brings these approved pulls to the dev branch, so they can be tested on dev.buttonweavers.com:
* #836: add color to overview page
* #838: mood swing dice can only reroll to standard die sizes
* #839: implement mad swing dice (no playable buttons use mad swing dice at the moment)

Database updates:
```
00509_mad_swing_01.sql
```