Upgraded ocean-rails to v3.x.
Merge branch 'master' into staging