update the ruby version
move to postgres
Merge branch 'master' into testcourses

Conflicts:
	db/schema.rb