Port from nested to CSS
Fixed sessions and cleaned up code
Done
Merge branch 'new'

Conflicts:
	web/static/test/css/layouts/side-menu.css
	web/templates/index.html