methodology table created with associations to traits and measurements
Merge branch 'Bulk_Upload_CSV' of https://github.com/jmadin/coraltraits into Bulk_Upload_CSV

Conflicts:
	db/schema.rb