New Question Mode
Merge branch 'master' of https://github.com/luc-sorignet/ChatBotCore

Conflicts:
	TODO/Test.aiml
	config/uploads/UPSSITECH.aiml
	logs/admin.error.log
	logs/error.log
merge