add additional methods to mi_attempts & phenotype_attempts public api
Merge branch 'staging' into add_methods_to_public_api
updates to tests for public api update
Merge branch 'staging' into add_methods_to_public_api
updates to phenotype_attempt#show interface for tat-cre
update to how phenotype_only mi_plans are validated
Merge branch 'tat-cre' into staging
Merge branch 'phenotype_only_validation_tweaks' into staging
add admin field to users table
updates for phenotype attempt tat-cre form
Re-generate assets
fixes to user test
Merge remote-tracking branch 'origin/master' into targ_rep_combined

Conflicts:
	app/models/user.rb
	db/schema.rb
	public/assets/common.css