errors to button database fixed
Merge remote-tracking branch 'upstream/master' into 445_button_db_fixes
* increase run-jscover-qunit.js timeout to 60 seconds
Merge pull request #501 from cgolubi1/500_qunit_timeout

increase run-jscover-qunit.js timeout to 60 seconds
* update post-puppet instructions for jenkins to include moving to
  /mnt under AWS
Merge pull request #503 from cgolubi1/502_jenkins_fsmount

update post-puppet instructions for jenkins to include moving to /mnt under AWS
Merge remote-tracking branch 'upstream/master' into 445_button_db_fixes
Giant and Guillermo have button, not dice, specials
Merge pull request #486 from ManvilleFog/445_button_db_fixes

445 button db fixes
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into 120_retain_prev_newgame