vexillophile

Noun

 * 1) A person who collects and displays flags.
 * 2) A person who studies flags and their history and meaning.