created new improvedChat branch from master

re-enables login
Fixed null FB and Google users and more.

Fixed an issue that caused the dropdown list of users to disappear
instead of opening a chat window after the first click of a user.
Removed pnotify alert that poped up when you try chatting with someone
you're already chatting with. Instead, the redundant requests will
result in a chat window opening.
debugging stuff
fixed fb/google chat
removed useless file
Fixed errors with fb and google logins and chat
Merge branch 'master' into improvedChatII

Conflicts:
	static/js/chatFunc.js
	views/layout.jade