Merge branch 'dev' into crem2

Conflicts:
	telemeta/models/media.py

diff --cc telemeta/models/query.py
Simple merge

diff --cc telemeta/urls.py
Simple merge

diff --cc telemeta/views/item.py
index b095323712e652b4979878b6411cacaf8353fba9,1f02aa76ea5f470b274c13d0966f95c4fed08551..c7e9c49ddafd493b79797056f6b482c7350b6cf5
--- 1/telemeta/views/item.py
--- 2/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@@ -120,19 -118,18 +121,16 @@@ class ItemView(object)
          if request.REQUEST.has_key('grapher_id'):
              grapher_id = request.REQUEST['grapher_id']
          else:
-             try:
-                 grapher_id = settings.TELEMETA_DEFAULT_GRAPHER_ID
-             except:
-                 grapher_id = 'waveform'
+             grapher_id = getattr(settings, 'TELEMETA_DEFAULT_GRAPHER_ID', 'waveform')
  
          previous, next = self.item_previous_next(item)
 -        mime_type = self.item_analyze(item)
 -        #FIXME: use mimetypes.guess_type
 -        if 'quicktime' in mime_type:
 -            mime_type = 'video/mp4'
  
 -        playlists = get_playlists(request)
 -        public_access = get_public_access(item.public_access, str(item.recorded_from_date).split('-')[0],
 -                                                str(item.recorded_to_date).split('-')[0])
 +        mime_type = item.mime_type
 +        if mime_type and mime_type != 'none' :
 +            if 'quicktime' in mime_type:
 +                mime_type = 'video/mp4'
  
 +        playlists = get_playlists(request)
          related_media = MediaItemRelated.objects.filter(item=item)
          check_related_media(related_media)
          revisions = Revision.objects.filter(element_type='item', element_id=item.id).order_by('-time')