Merge branch 'master' into subhire

# Conflicts:
#	Pipfile.lock

RIGS/templates/base_print.xml

@@ -11,6 +11,7 @@
         <initialize>
             <color id="LightGray" RGB="#D3D3D3"/>
             <color id="DarkGray" RGB="#707070"/>
+            <color id="Brand" RGB="#3853a4"/>
         </initialize>
 
         <paraStyle name="style.para" fontName="OpenSans" />
@@ -27,6 +28,8 @@
         <paraStyle name="style.times" fontName="OpenSans"  fontSize="10" />
         <paraStyle name="style.head_titles" fontName="OpenSans-Bold" fontSize="10" />
         <paraStyle name="style.head_numbers" fontName="OpenSans"  fontSize="10" />
+        <paraStyle name="style.emheader" fontName="OpenSans" textColor="White" fontSize="12" backColor="Brand" leading="20" borderPadding="4"/>
+        <paraStyle name="style.breakbefore" parent="emheader" pageBreakBefore="1"/>
 
         <blockTableStyle id="eventSpecifics">
             <blockValign value="top"/>

RIGS/templatetags/filters.py

@@ -199,8 +199,8 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
         text = "Edit"
     elif type == 'print':
         clazz += " btn-primary "
-        icon = "fa-print"
-        text = "Print"
+        icon = "fa-download"
+        text = "Export"
     elif type == 'duplicate':
         clazz += " btn-info "
         icon = "fa-copy"