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'
Altered audit file to exclude test/src/database
Updated path of mysql.test.inc.php in BMInterfaceTest.php so that it passes PagodaBox
Updated path of mysql.test.inc.php in BMInterface to make it work on Pagodabox
Made function prototypes consistent
Merge remote-tracking branch 'origin/master' into active_turn
Merge remote-tracking branch 'origin/active_games' into active_turn
Merge branch 'active_turn' of https://github.com/blackshadowshade/buttonmen into active_turn