Update to Rails 4 final version
Merge branch 'master' into working
Ran migration which updated schemadb.rb
Merge branch 'working'