Chat UI Integration
Merge branch 'ux' into dev

Conflicts:
	Maple/views.py