Merge remote-tracking branch 'English_texts/master'

# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html

cps/templates/shelf_order.html

@@ -2,7 +2,7 @@
 {% block body %}
   <div class="col-sm-8 col-lg-8 col-xs-12">
     <h2>{{title}}</h2>
-    <div>{{_('Drag \'n drop to rearrange order')}}</div>
+    <div>{{_('Drag to Rearrange Order')}}</div>
       <div id="sortTrue" class="list-group">
         {% for entry in entries %}
           <div id="{{entry['id']}}" class="list-group-item">
@@ -37,6 +37,3 @@
 <script src="{{ url_for('static', filename='js/libs/Sortable.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/shelforder.js') }}"></script>
 {% endblock %}
-
-
-