Merge branch 'records'

Conflicts:
	spec/models/record_spec.rb