Merge remote-tracking branch 'upstream/master'
Merge branch 'api_nomock'
Merge branch 'api_nomock_merged'
Merge remote-tracking branch 'upstream/master'
Merge branch 'api_nomock_merged'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'cgolubi1/infrastructure'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'infrastructure_test'
Merge remote-tracking branch 'upstream/master'
Added logic to save $game->waitingOnActionArray to database
Fixed play_turn.html interpretation of async response from responder.php
Fixed play_turn.html calculation of defenderIdx from attackerIdx
Shifted test_submit.php logic into responder.php, fixed types to work correctly
Made function prototypes consistent
Merge remote-tracking branch 'origin/master' into active_turn
Merge remote-tracking branch 'origin/active_games' into active_turn