pull changes from master to dev on 2014-08-14

This update brings these approved pulls to the dev branch:
* User-visible:
  * #1174: Informational pages for button sets and buttons
  * #1171: "Default" attack works for one-on-one attacks with no side effects even if the attack could be made using multiple attack types
  * #1188: create game bugfix --- default should now be 3 rounds again
  * #1190: fix misleading text when dizzy dice are visible in the fire turndown UI
  * #1186: allow dismissing games from game pages
  * #1191: warn new users that the verification e-mail could be tagged as spam
* Ideally not user-visible:
  * #1165, #1179, #1180, #1175: javascript unit test tweaks to fix some testing problems we've been having
  * #1192: fix start time for some old inactive games in the DB
  * #1193: refactor of the code that disables the submit button after you click it
  * #1194: load moment.js at the same time as other scripts, rather than conditionally

Database updates:
```
1088_game_creation_time_03.sql
912_button_text.sql 
```

Once this pull is merged, i will load the changes on dev.buttonweavers.com as part of #217.