Merge branch 'dev' into feature/haystack

Conflicts:
	setup.py

diff --cc examples/sandbox/settings.py
index 278a44cdad98b4120412c4a9327f08126bbf1b77,0b02f2d2d6c7c0ff2c9aa2264e5020a0bd245c6f..bc90e5d6d89b241e5ed0941d6ee8b5e612f63c4c
--- 1/examples/sandbox/settings.py
--- 2/examples/sandbox/settings.py
+++ b/examples/sandbox/settings.py
@@@ -159,9 -159,9 +159,10 @@@ INSTALLED_APPS = 
      'bootstrap_pagination',
      'googletools',
      'registration',
+     'epub',
      'rest_framework',
      'djcelery',
 +    'haystack',
  )
  
  TEMPLATE_CONTEXT_PROCESSORS = (

diff --cc setup.py
index d62ede84fbdebec59a46461701ad143bd16bb8b4,4dfdbefad540729c0d7fa35a2cf15465847451f8..386b357cd3bf285b323ce0d57371c57741176830
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -73,7 -72,7 +73,8 @@@ setup
          'pyyaml',
          'python-ebml',
          'zipstream',
 +        'elasticsearch',
+         'ebooklib',
      ],
    tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],
    # Provide a test command through django-setuptest

diff --cc telemeta/urls.py
Simple merge