Gemfile.lock updated
Merge branch 'design' into release
pagination fixed