update rvmrc
Merge branch 'hotfix/update_to_work_with_rails4' into develop
update rvmrc
update rvmrc
Merge branch 'release/update'