Updated for Rails 4
Updated to Rails 4 — Merge branch 'develop'