merged fancybox/css modal branch into master