fixed select for merchants form
associated farms in merchants controller
Merge branch 'master' of https://github.com/jophis/localvore