refactored media model
fixed search controller
moved controller methods to application controller
refactored controller and fixed bug
added service icon method
refactored genre icons method and added service icon method
added thread safe
Merge pull request #72 from bobolinks-2014/controller

Controller
fixed merge conflicts
fixed these conflicts
returned the result
Merge pull request #74 from bobolinks-2014/front-end-testing

Front end fixes
fixed merge conflicts
finished users controller spec
updated routes again