Merge branch 'master' into saclay

Conflicts:
	chimere/admin.py
	chimere/fixtures/initial_data.json
	chimere/forms.py
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/models.py
	chimere/static/chimere/css/styles.css
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/views.py
	chimere/widgets.py

1 files changed, 5 insertions, 1 deletions

diff --git a/chimere/feeds.py b/chimere/feeds.py
index c4ee7a5..100dd6b 100644
--- a/chimere/feeds.py
+++ b/chimere/feeds.py
@@ -21,7 +21,8 @@
 
 from django.conf import settings
 from django.contrib.gis.geos import *
-from django.contrib.syndication.views import Feed, FeedDoesNotExist
+from django.contrib.gis.feeds import Feed
+from django.contrib.syndication.views import FeedDoesNotExist
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
@@ -53,6 +54,9 @@ class BaseFeed(Feed):
     def description(self, obj):
         return ""
 
+    def item_geometry(self, obj):
+        return obj.point
+
 class LatestPOIsByCategory(BaseFeed):
     '''
     Last Points of interests by category in Feeds