Navigation
Merge branch 'origin/master'

Conflicts:
	web/CSS/CSSLayout.css
	web/login.xhtml
	web/viewThread.xhtml