Merge branch 'master' into development
Changes page title
Adds jruby to project
Merge branch 'development'