'table_associations'
'table_associations'
'table_associations'
'behind'
fixing association conflicts
Merge remote-tracking branch 'upstream/umass_branch' into umass_branch

Conflicts:
	app/models/author_cite.rb
	app/models/competition_interaction.rb
	app/models/facilitation_interaction.rb
	app/models/node_max_age.rb
	app/models/node_range.rb
	app/models/stage_biomass_change.rb
	app/models/stage_duration.rb
	app/models/stage_habitat.rb
	app/models/stage_length.rb
	app/models/stage_length_fecundity.rb
	app/models/stage_lifestyle.rb
	app/models/stage_mobility.rb
	app/models/stage_reproductive_strategy.rb
	app/models/stage_residency.rb
	app/models/stage_residency_time.rb
	app/models/trophic_interaction.rb
	log/development.log
Merge pull request #53 from kevb0001/umass_branch

Umass branch