Merge origin/master

Conflicts:
	src/edu/nps/moves/dis7/utilities/logs/Entity90DegreesTurnBase64.dislog
	src/edu/nps/moves/dis7/utilities/logs/Entity90DegreesTurnPlainText.dislog
	src/edu/nps/moves/dis7/utilities/logs/GAZ69MultipleBlocksBase64.dislog
	src/edu/nps/moves/dis7/utilities/logs/GAZ69MultipleBlocksPlainText.dislog
	src/edu/nps/moves/dis7/utilities/logs/GAZ69SingleBlockPlainText.dislog
	src/edu/nps/moves/dis7/utilities/logs/Gaz69StraightPlainText.dislog
	src/edu/nps/moves/dis7/utilities/logs/HawaiiGroundFirst3MinPlainText.dislog
	src/edu/nps/moves/dis7/utilities/logs/PdusaveGAZ69PatrolingPlainText.dislog