Manually added echelons/sim/ex/a few sample HQs
Manually added echelons/sim/ex/a few sample HQs

Note: I accidentally deleted the notes column while editing (but not needed), but it will be put back once it is able to be auto-generated
Merge remote-tracking branch 'upstream/master'

Conflicts:
	samples/imagefile_name_category_tags/Military-Frame-And-Modifier-Source-Icons-Test.csv
	samples/imagefile_name_category_tags/Military-Frame-And-Modifier-Source-Icons.csv

Fixed conflict by deleting frame and modifier files.