some changes - don't know what exactly
Merge branch 'master' of github.com:speendo/genBot2

Conflicts:
	DeleteFromQueue.java