Merge pull request #8 from red-admirals-2014/new_search

New search
fixed controller names
Merge branch 'master' into new_search