Fixes Gemfile.lock
Fixes asset generation
Merge branch 'production'