Merge branch 'master' into publisher-opds

frontend/templates/new_edition.html

@@ -35,7 +35,7 @@
 		
 		<p>
 		<b>Authors</b>:
-		{% if edition.pk and edition.relators or edition.new_author_names %}
+		{% if edition.pk and edition.relators or edition.new_authors %}
 		<ul>
 			{% if edition.pk and edition.authors %}
 				{% for relator in edition.relators.all %}

requirements_versioned.pip

@@ -8,6 +8,7 @@ PyGithub==1.15.0
 PyYAML==3.11
 git+git://github.com/urschrei/pyzotero.git@v0.9.51
 South==0.7.6
+SPARQLWrapper==1.6.4
 WebOb==1.2.3
 WebTest==1.4.0
 amqplib==1.0.2
@@ -40,9 +41,10 @@ django-tastypie==0.9.11
 feedparser==5.1.2
 freebase==1.0.8
 #gitenberg.metadata==0.1.6
-git+ssh://git@github.com/gitenberg-dev/metadata.git@2c0fdd5a54f6b893cbb4cc0ee0e4ec6fa3ffbb93
+git+ssh://git@github.com/gitenberg-dev/metadata.git@e16b2f18b8d2842b8700914a96e756d887062bc1
 html5lib==1.0b3
 httplib2==0.7.5
+isodate==0.5.1
 kombu==2.4.5
 lxml==2.3.5
 mechanize==0.2.5
@@ -55,11 +57,13 @@ postmonkey==1.0a4
 pyasn1==0.1.4
 pycrypto==2.6
 pymarc==3.0.2
+pyparsing==2.0.3
 python-dateutil==2.1
 python-openid==2.2.5
 python-social-auth==0.2.6
 pytz==2012d
-rdflib==2.4.1
+rdflib==4.2.0
+rdflib-jsonld==0.3
 redis==2.6.2
 reportlab==3.1.8
 requests==2.6.0