start univ search
Merge branch 'master' into universal_search

* master: (22 commits)
  fix controller
  fix dish controller
  migrate
  All Dishes works correctly
  xhr search
  implementation of comment form and tests
  implementation of comment form and tests
  test
  comment tests
  getting data back from search
  tests pass inoojs
  tests pass before search
  first oojs tests pass
  css to homepage
  completed comment/review post view
  completed work to comment controller
  completed work to comment controller
  completed work to comment controller
  included modifications to models
  included modifications to models
  ...
add Dish search to restaurants index
continue workgin on uni serach
.
resolve conflict
add test for search returning dishes in restaurant view
what?
Merge branch 'master' into universal_search

* master:
  trying other doc rdy
  only on pg load
add test for universal search
Merge branch 'master' into universal_search

* master:
  flipping cards
  im an idiot
  try no minification
  fixed some js semicolos
  removed voting table and models
  removed vote tables and models
  fixed test
  bind card click to body
  fixing some more css
  good looking upload
  workingon css
turn uglifier off
Merge pull request #110 from eugenefilimonov/universal_search

Universal search