made some changes to doCallbacks() method
Some cosmetic improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/AddServerImpl.java