Added Disconnect logic
Merge origin/master

Conflicts:
	src/ChatLog.java
Merge origin/master

Conflicts:
	src/ChatLog.java