iMentor and SearchBox
Merge origin/master

Conflicts:
	public_html/public/message.html