[BUGFIX] Fix bug of non displaying discussions in chat
[UPDATE] remove console.log + other corrections
[RESOLVE] conflicts

Conflicts:
	app/Controllers/App_controller.php
	assets/js/matchs.js