Merge branch 'master' into dev

diff --cc telemeta/__init__.py
index 8c5c4b16bc02343c3bbe5d9e2da8c69cb47a02cb,2002e455f8b02338f991479e9128030f02295a9c..613ad0f5c1dd6b3552b8687e068c5103f60edfbf
--- 1/telemeta/__init__.py
--- 2/telemeta/__init__.py
+++ b/telemeta/__init__.py
@@@ -15,12 -15,12 +15,12 @@@ U{http://telemeta.org
  """
  
  __docformat__ = 'epytext en'
 -__version__ = '1.6.5'
 +__version__ = '1.7.0'
  __url__ = 'http://telemeta.org'
- __copyright__ = '(C) 2006-2017 Parisson SARL'
+ __copyright__ = '(C) 2006-2018 Parisson SARL'
  __license__ = 'AGPLv3'
  __license_long__ = """
- Copyright (C) Parisson SARL (2006-2017)
+ Copyright (C) Parisson SARL (2006-2018)
  
  This file is part of Telemeta.
  

diff --cc telemeta/views/item.py
Simple merge