Merge branch 'hotfix/rails4'
Update Ruby to 2.0.0-p247
Merge branch 'hotfix/UpdateRuby247' into develop