Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
update Gemfile.lock
update : css etc.
fix bootstrap 2