Merge branch 'master' into markdown

# Conflicts:
#	RIGS/static/css/print.css
#	RIGS/static/css/screen.css
#	RIGS/static/scss/screen.scss
#	RIGS/templates/RIGS/event_print_page.xml
#	RIGS/test_unit.py
#	requirements.txt

RIGS/static/scss/email.scss

@@ -0,0 +1,64 @@
+$button_color: #357ebf;
+
+body{
+  margin: 0px;
+}
+
+.main-table{
+  width: 100%;
+  border-collapse: collapse;
+  
+}
+
+.client-header {
+  background-image: url("https://www.nottinghamtec.co.uk/imgs/wof2014-1.jpg");
+  background-color: #222;
+  background-repeat: no-repeat;
+  background-position: center;
+  
+  width: 100%;
+
+  margin-bottom: 28px;
+
+  .logos{
+    width: 100%;
+    max-width: 640px;
+  }
+
+  img {
+    height: 110px;
+  }
+}
+
+.content-container{
+  width: 100%;
+
+  .content {
+    font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    
+    width: 100%;
+    max-width: 600px;
+    padding: 10px;
+    text-align: left;
+
+    .button-container{
+      width: 100%;
+
+      .button {
+        padding: 6px 12px;
+        background-color: $button_color;
+        border-radius: 4px;
+
+        a {
+          color: #fff;
+          text-decoration: none;
+        }
+        
+      }
+
+    }
+
+  }
+}
+
+

RIGS/static/scss/screen.scss

@@ -54,7 +54,7 @@ textarea {
   max-width: 2em;
 }
 
-.item_row .description {
+.item-description {
   margin-left: 1em;
 }
 
@@ -148,6 +148,51 @@ ins {
   }
 }
 
+html.embedded{
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+  max-height: 100%;
+  overflow: hidden;
+  justify-content: center;
+
+  body{
+    padding:0;
+    width:100%;
+    background:none;
+    overflow: auto;
+  }
+
+  .embed_container{
+    border:5px solid #e9e9e9;
+    padding:12px 0px;
+    min-height:100%;
+    width:100%;
+  }
+
+  .source{
+    background: url('/static/imgs/pyrigs-avatar.png') no-repeat;
+    background-size: 16px 16px;
+    padding-left: 20px;
+    color: #000;
+  }
+
+  h3{
+    margin-top:10px;
+    margin-bottom:5px;
+  }
+
+  p{
+    margin-bottom:2px;
+    font-size: 11px;
+  }
+
+  .event-mic-photo{
+    max-width: 3em;
+  }
+}
+
 .markdown {
   h1 {
     font-size: $font-size-h1 * 0.75;