Pending
Pending
Merge branch 'master' into feature/case_study

Conflicts:
	app/models/address.rb
	app/models/case_file.rb
	app/models/family.rb
adding in uber search
Merge branch 'feature/case_study' into develop