Few changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	AdminDb.java
	SocketListener.java