201308201559

123
201308201601Merge branch 'Eric'

Conflicts:
app/models/record.rb
app/views/records/_form.html.erb
Merge branch 'master' into Eric

Conflicts:
	app/models/record.rb
	app/views/records/_form.html.erb