Navbar and Search
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/templates/events/list.html