some changes...
Merge branch 'master' of github.com:speendo/genBot2

Conflicts:
	QueueManager.java