updated prod and dev env
updated fancybox to 2.1.4
update
updated merge failing and prod env