Merge branch 'dev' into crem2

Conflicts:
	telemeta/models/media.py
	telemeta/urls.py

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

diff --cc telemeta/static/telemeta/css/telemeta.css
Simple merge

diff --cc telemeta/templates/telemeta/base.html
Simple merge

diff --cc telemeta/urls.py
index 5b7a2fa764cbc357e4458524ddf6ffdfac43f349,bb85197e1f9029d72ca4e9f7ad2dd65dfa9966c9..bcbf6a1577cae22d9b597a886ecadfabcb720608
--- 1/telemeta/urls.py
--- 2/telemeta/urls.py
+++ b/telemeta/urls.py
@@@ -39,9 -39,8 +39,8 @@@ from django.conf import setting
  from django.views.generic.simple import redirect_to
  from telemeta.models import MediaItem, MediaCollection, MediaItemMarker, MediaCorpus, MediaFonds
  from telemeta.views import HomeView, AdminView, CollectionView, ItemView, \
-                                 InstrumentView, PlaylistView, ProfileView, GeoView, \
-                                 LastestRevisionsFeed, ResourceView, UserRevisionsFeed, \
-                                 CollectionPackageView
 -                                InstrumentView, InstrumentAliasView, PlaylistView, ProfileView, GeoView, \
 -                                LastestRevisionsFeed, ResourceView, UserRevisionsFeed
++                            InstrumentView, InstrumentAliasView, PlaylistView, ProfileView, GeoView, \
++                            LastestRevisionsFeed, ResourceView, UserRevisionsFeed, CollectionPackageView
  from jsonrpc import jsonrpc_site
  import os.path
  import telemeta.config