Merge branch 'hotfix/restore_Gemfilelock'

* hotfix/restore_Gemfilelock:
  restore Gemfile
edit application.rb
react compile
Merge branch 'hotfix/fix_react_compile' into develop

* hotfix/fix_react_compile:
  react compile