Merge branch 'develop'

Completed error handling in subadd:addentry; this is polished enough for the
first semi-useful rough alpha, at this point.

Author: dgets

subadd/templates/subadd/add.html

@@ -43,8 +43,12 @@ <h2>Add Substance</h2>
 
     <br>
 
-    <input type="submit" value="Add Substance" />
+    {% if add_sub_form %}
 
+      <input type="submit" value="Add Substance" />
+
+    {% endif %}
+      
   </form>
 
  </body>

subadd/views.py

@@ -65,9 +65,9 @@ def addentry(request):
 
     except:
         context = {}
-        context['error_message'] = "Please navigate to addentry only from here."
+        context['error_message'] = "Please navigate to addentry (here) only from the links."
 
-        return render(request, 'subadd/add.html', context)
+        return render(request, 'subadd/add.html', add_header_info(context))
 
 
     try: