latest code
latest
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/ids/sql/SQL6.java
	src/main/webapp/pages/idsmain.jsp

Signed-off-by: John Hawthorne <john.hawthorne@thatdevice.com>
remove