Added search feature
Modified chat template
merge upstream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/base.html
	templates/chat/chat.html