Added __random to button selectors
Display Random Button as such on Open Games page
Fixed indentation
Resolve __random button selections only after all buttons have been selected
Merge remote-tracking branch 'blackshadowshade/1157_random_button' into 186_random_button_ui
Do not resolve __random button selection until all players have joined the game
Merge remote-tracking branch 'blackshadowshade/1157_random_button' into 186_random_button_ui
Made list of open games randoms better
Moved logic for resolving __random button selections to BMInterface->save_game()
Merge remote-tracking branch 'upstream/master' into 1157_random_button

Manually resolved conflicts in:
	src/engine/BMGame.php
	src/engine/BMInterface.php
Fixed python unit test
Refactored DummyApiResponder to satisfy PMD
Updated is_awaiting_action manually to 0 when choosing button, and forced game to proceed_to_next_user_action
Fixed display of random button on open games
Merge remote-tracking branch 'upstream/master' into 1157_random_button

Initial attempt at manually resolving conflicts in:
	deploy/database/views.button.sql
	src/api/ApiResponder.php
	src/api/DummyApiResponder.php
	src/engine/BMInterface.php
	test/tools/api-client/python/lib/test_bmapi.py
Fixed code so that all unit tests run
Merge remote-tracking branch 'blackshadowshade/1157_random_button' into 186_random_button_ui
Updated test_Api.js to match the changes to BMInterface->getButtonData()
Explicitly force buttonId to be integer
Merge remote-tracking branch 'blackshadowshade/1157_random_button' into 186_random_button_ui