Merge branch 'dev' into feature/haystack

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

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

diff --cc telemeta/templates/telemeta/base.html
index 3977c8732f6d52d9788da8fa0d1a9377bc5a5ef9,4e1121d6c98fbef6045638a5bdbf37dd6d046e07..94400ad728ed248f2b6f25602be7d7f8223dc765
--- 1/telemeta/templates/telemeta/base.html
--- 2/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@@ -91,10 -91,14 +91,11 @@@
  {% endif %}
  </div>
  
+ {% block search %}
  <div id="quick_search">
 -<form action="{% url "telemeta-search" %}" id="_quickSearchForm" method="get">
 +<form action="{% url "haystack_search" %}" id="_quickSearchForm" method="get">
      <div class="input-group">
 -      <input type="text" class="form-control" name="pattern">
 -      <span class="input-group-btn">
 -        <button class="btn btn-default" type="button" onclick="$('#_quickSearchForm').submit();"><span class="glyphicon glyphicon-search"></span></button>
 -      </span>
 +       <input class="form-control" id="id_q" name="q" type="text" /><span class="input-group-btn"><button type="submit" id="btn" class="btn btn-default"><span class="glyphicon glyphicon-search"></span></button></span>
      </div>
  </form>
  </div>

diff --cc telemeta/urls.py
Simple merge