Merge remote-tracking branch 'upstream/master' into gs-master

app/javascript/packs/common.js

@@ -1,6 +1,8 @@
 import { start } from 'rails-ujs';
+import 'font-awesome/css/font-awesome.css';
 
 // import common styling
 require('../styles/common.scss');
+require.context('../images/', true);
 
 start();