Fix for lock command
Merge remote-tracking branch 'origin/master'

Conflicts:
	teaBot.py