Merge remote-tracking branch 'origin/merge-pages'
Merge branch 'master' of github.com:phoenix-scitent/okm
fix gemfile