Fix bug on key display
Adding wizz feature to the chat
Merge branch 'develop'
Adding comptoir name and desc. on comptoir page
fixing bug on badges update
Working on design
Correction of slimscroll bug and add name & title update
Merge branch 'develop' into feature/wizz

Conflicts:
	chat/templates/chat/see_comptoir.html
Fixing bugs on shake
Fixing errors on session management
Fix bugs on online list of users
Fix bug on ajax browsing
Working on style
Importing glaphicons
Style on my-comptoir list
Merge branch 'develop'

Conflicts:
	chat/static/chat/js/key_management.js
	chat/templates/chat/see_comptoir.html
Importing Jquery-ui
Merge branch 'develop'
Fixing bug on sockets
Remove useless views