fixed location stuff and map alomost done
Merge branch 'master' of https://github.com/GeoChatTeam/geochat

Conflicts:
	views/chat.ejs