Merge branch 'release/2.4.0' into develop

* release/2.4.0:
  update to 2.4.0
added Gemfile.lock to repo
hopefully fixed sprockets requirement
Merge branch 'release/2.4.1'

* release/2.4.1:
  hopefully fixed sprockets requirement
  added Gemfile.lock to repo