Merge branch 'master' into develop

resources/assets/js/bootstrap.js

@@ -7,9 +7,11 @@ window._ = require('lodash');
  * code may be modified to fit the specific needs of your application.
  */
 
+try {
     window.$ = window.jQuery = require('jquery');
 
     require('bootstrap-sass');
+} catch (e) {}
 
 /**
  * We'll load the axios HTTP library which allows us to easily issue requests