fixed controller issues
media model specs for genre_icons method
Merge pull request #69 from bobolinks-2014/model-spec

media model specs for genre_icons method
Session Controller cleanup, added genre_icons to search controller spec.
Merge pull request #70 from bobolinks-2014/controller

Controller
refactored media model
fixed search controller
Merge pull request #71 from bobolinks-2014/controller-spec

Controller spec
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 these conflicts