Merge remote-tracking branch 'origin/master'

Conflicts:
	app/templates/loading.html
	app/templates/room.html

app/app.css

@@ -470,6 +470,17 @@ footer a:hover{
 .pl-container h4{
   text-decoration: underline;
 }
+#spinner {
+  font-size: 200px;
+  color: bisque;
+}
+
+#spinner-container {
+  margin-left: auto;
+  margin-right: auto;
+  width: 200px;
+  margin-top: 10%;
+}
 #croom_container {
   margin-left: auto;
   margin-right: auto;
@@ -492,4 +503,4 @@ footer a:hover{
   margin-right: auto;
   width: 200px;
   margin-top: 10%;
-}
+}

app/templates/loading.html

@@ -2,4 +2,4 @@
     <div id="spinner-container">
         <i class="fa fa-spinner fa-pulse" id="spinner"></i>
     </div>
-</template>
+</template>