Merge branch '193_history_flags' into 829_ArrArr
Replaced all instances of ArrArr by ArrayArray
Merge branch 'master' into 829_ArrArr
Merge pull request #831 from blackshadowshade/829_ArrArr

Change ArrArr to ArrayArray