add Unicorn to Gemfile.lock
Merge branch 'develop' of https://github.com/amooma/GS5 into develop