Add message grouping and flexible namespaces
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/models/Conversation.php