Fix bug on key display
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	chat/static/chat/js/key_management.js
	chat/templates/chat/see_comptoir.html
Merge branch 'develop'
Merge branch 'develop'
Fix bug from removing useless views