Added fancybox
Merge branch 'master' into dev

Conflicts:
bower.json
Fancybox slider