Merge branch '193_history_flags' into 829_ArrArr
Replaced all instances of ArrArr by ArrayArray
Merge branch 'master' into 829_ArrArr
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into 845_dept_of_redundancy_dept
Removed unnecessary "Game" from page titles
Merge pull request #831 from blackshadowshade/829_ArrArr

Change ArrArr to ArrayArray
Merge pull request #847 from AdmiralJota/845_dept_of_redundancy_dept

845 Removed unnecessary "Game" from page titles
Merge remote-tracking branch 'upstream/master' into 848_optRequest_clear

Manually resolved conflicts in:
	src/engine/BMGame.php