Merge branch '93_option' into 90_mood_swing
* partial updated API layer for submitDieValues
Merge branch '93_option' of https://github.com/blackshadowshade/buttonmen into 93_option_ui

Conflicts:
	test/src/api/responderTest.php
* UI, API layer, and log_action fix for submitDieValues
* fix tabs for checkstyle
Merge pull request #749 from blackshadowshade/93_option

Option backend
Merge pull request #807 from cgolubi1/93_option_ui

UI, API, and action log fixes for option
Merge remote-tracking branch 'upstream/master' into 90_mood_swing
Merge remote-tracking branch 'upstream/master' into 90_mood_swing
No-op commit to force Jenkins to re-run.
Merge pull request #774 from blackshadowshade/90_mood_swing

Mood swing
Merge branch 'master' into 202_prev_swing