Fixed random
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/chatbot/controller/ChatbotAppController.java