updates for java 7
updates for java 7
Merge branch 'master' into fix-eol

Conflicts:
	build.xml
	nbproject/project.properties
	src/jsattrak/gui/JSatTrak.java
	src/jsattrak/gui/LookAndFeelJDialog.java
	src/jsattrak/utilities/IconTreeNodeRenderer.java
	src/name/gano/swingx/treetable/IconTreeTableNodeRenderer.java