add sidebar
correct placing of map
add nav
Merge branch 'hack_chris' into jui

Conflicts:
	index.html