Merge branch 'hotfix/unicorn_fix'
Ensured kaminari gem lock to version 0.15.1 to avoid paginate error on rails_admin. kaminari version 0.16.0 disable pagination function.
Merge branch 'hotfix/kaminari_fix' into develop