Logout now opens a new window while the original page redirects to the login
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/components/navbar/navbar.controller.js