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

Conflicts:
	chat/static/chat/js/init_page_elements.js