Start geoloc, misc enhancement

Signed-off-by: Thierry Le Moulec <thierry@smoothie-creative.com>
Merge branch 'master' of github.com:NodeJsGrenoble/Cocity.io

Signed-off-by: Thierry Le Moulec <thierry@smoothie-creative.com>

Conflicts:
	coffee/script.coffee
	public/js/script.js
	server.coffee
Update package.json

Signed-off-by: Thierry Le Moulec <thierry@smoothie-creative.com>