Merge pull request #24 from rohaus/master

Customize map - limit zoom and custom markers
Remove player's marker when quit
Merge branch 'devSocket'

Conflicts:
	config/socket/socket.js
	public/models/map.js
Merge pull request #25 from Ken123777/master

Remove player's marker from the map upon leaving
Merge branch 'master' of https://github.com/RebootJeff/phone-tag

Conflicts:
	public/models/map.js
Remove trailing spaces and change tag tag distance
Remove trailing spaces
Add radar like display for markers
Add marker radar display based on distance