add events
Merge branch 'origin/feature-attachments'

Conflicts:
	app/comps/conversations/drtv-message-file.js
add events
update