fix userid timeline comments
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/directives/timelinecomments.js
gestion upload fichier