fixed controller names
Merge branch 'master' into new_search
Merge pull request #9 from red-admirals-2014/new_search

New search