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

merging master
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into ajax-frontend-calls

add master
fixing merge conflict
Updated runtime icon tooltip
css updates
Merge branch 'frontend' of https://github.com/bobolinks-2014/browsin into frontend

merging frontend
added click link features
added linkable media
finished runtime and top bar
updated controllers and models for user profile
updated search for user hidden media
updated user preference associations
updated user preferences table
added user profile page modal
updated view status in search controller
Merge pull request #53 from bobolinks-2014/user-preferences

User preferences
updated specs
user frontend
finished omdb parser spec
fixed merge conflicts