dan's menu magic
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	src/main/java/com/raytheon/ControlWindow.java
	src/main/resources/ControlWindow.fxml
Merge pull request #1 from danmergens/master

it's super awesome