add global chat notifications
Merge branch 'master' into instant-messaging
update server.js
[UPDATE]JSON test
update profile data json generation
Merge branch 'instant-messaging'
Merge branch 'profil'

Conflicts:
	app/Views/profil.html