add geo
Merge branch 'master' of github.com:osanllyer/Msite

Conflicts:
	common/__init__.pyc
	common/definitions.pyc