fixed small javascript error
show window.user only if user is logged in
Merge remote-tracking branch 'origin/master'