Got all labels and combo boxes to read from the language file. Just need to get the table headers.
Got all labels and combo boxes to read from the language file. Just need to get the table headers.
Got all labels and combo boxes to read from the language file. Just need to get the table headers.
Got all labels and combo boxes to read from the language file. Just need to get the table headers.
Got all labels and combo boxes to read from the language file. Just need to get the table headers.
Merge origin/master

Conflicts:
	src/display/AddGeneWindow.java
	src/display/GUI.java