Merge branch 'dev' into feature/haystack

diff --cc examples/sandbox/settings.py
Simple merge

diff --cc telemeta/templatetags/telemeta_utils.py
Simple merge

diff --cc telemeta/urls.py
Simple merge

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

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