merge seeding
Merge branch 'master' of github.com:skoba/rdolphin

Conflicts:
	app/models/content_item.rb
	spec/models/content_item_spec.rb
add ehr controlelr spec