Navbar - One more hyphen and a class adjustement
Account - JSF
Merge branch 'master' of https://github.com/sidewinder94/booXstore

Conflicts:
	booXtore/booXtore-war/web/WEB-INF/includes/navbar.xhtml