Merge branch 'master' into dev
Fix repeating images in fancybox
Merge branch 'dev'
Update bower
Merge branch 'dev'
Cleanup