Done with integration, bug testing not complete

bug testing needed for quant_subrecipes
Merge branch 'Friendly-id-tier1-tier2'

Conflicts:
	db/development.sqlite3
	db/schema.rb