upgdate to work with rails 4
Merge branch 'hotfix/update_to_work_with_rails4'