merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	spec/models/ehr_spec.rb
	spec/models/ehr_spec.rb