updated to newest version
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/server.erl
	src/serverQueueMgmt.erl