Fix bug on comptoir list
Fix bug on ajax comptoir
Merge branch 'develop' into feature/ws

Conflicts:
	chat/views.py