Committing topic window add changes on TeamViewer PC
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChatDashboard/chatapp/templates/dashboard.html