Add plugin for fancybox
Add plugin for fancybox
update
resolve conflicts
Add plugin for piwik