Merge remote-tracking branch 'origin/Abdul' into Abdul

Conflicts:
	src/com/abdul/server/ServerTest.java