Merge remote-tracking branch 'origin/August'

Conflicts:

	GameDatabase/9acef3d0-efa8-4d3f-a10c-54812baecdda/Documents/ChangeLog.html

	GameDatabase/9acef3d0-efa8-4d3f-a10c-54812baecdda/Plugins/Octgn.MagewarsPlugin/Octgn.Magewars.dll
	GameDatabase/9acef3d0-efa8-4d3f-a10c-54812baecdda/scripts/actions.py