adds methods to only return merchants with active edibles/concentrates
merchant controller now users new model methods
adds url to merchant show page
adds url as admin to edit page
adds admin url to edit page
adds url to edit flower from show page
Merge pull request #17 from githop/active_companies

Active companies