geoloc ###
Merge branch 'master' of https://github.com/pixelpark/ppnet

Conflicts:
	www/config.xml