Merged develop into develop-promise

.gitignore

@@ -11,4 +11,4 @@ working.png
 ruby/.rails5-gems
 web/.rails5-gems
 websocket-gateway/.rails5-gems
-.pg_data/
+.pg_data/

jam-ui/src/components/sessions/JKSession.js

@@ -189,7 +189,7 @@ function JoinSessionButton({ session }) {
       className="btn-join btn-sm mr-1 mb-1 pt-1 pb-1 pl-1 pr-1"
       style={{ cursor: 'pointer' }}
     >
-      <img src={EnterIcon} alt="enter" className="mr-1" width={30} />
+      <img src={EnterIcon} alt="enter" className="mr-1" width={20} />
     </Button>
   );
 }