merge
Merge branch 'master' of github.com:jumpingnuts/ssul-it-client-web into deka58

Conflicts:
	app/index.html
	app/views/navbar.html