net send resolve
Merge branch 'master' of https://github.com/donahue-ldz/EQ

Conflicts:
	bin/com/lzw/EQ$10.class
	bin/com/lzw/EQ$11.class
	bin/com/lzw/EQ$9.class
	bin/com/lzw/EQ$SysTrayActionListener.class
	bin/com/lzw/EQ$messagerGroupSendActionListener.class
	bin/com/lzw/EQ.class
	db_EQ/db.lck
	db_EQ/log/log.ctrl
	db_EQ/log/log2.dat
	db_EQ/log/logmirror.ctrl
	db_EQ/seg0/c420.dat
	derby.log
	src/com/lzw/EQ.java
resolve many bugs