Merge branch 'master' of https://github.com/bobolinks-2014/browsin into controller

merging master
refactored media model
fixed search controller
session tests in the works
Merge branch 'controller' into front-end-testing

merging graces controller fixes.
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 branch 'controller' of https://github.com/bobolinks-2014/browsin into front-end-testing

merging graces fixes with controlelr
updated routes
search merges and icon fixes