Fix geom
Merge branch 'master' of github.com:LogLock/LogLock.backend

Conflicts:
	cartodb_sql.py