added fancybox and jquery shadow
fixed merge conflict in Gemfile