Restablished the use of old location field as we are facing issues linked to sorting and boosting
Merge branch 'index-shapes' into oxpoints-improvements

* index-shapes:
  Restablished the use of old location field as we are facing issues linked to sorting and boosting

Conflicts:
	moxie/places/solr.py