update
Merge remote-tracking branch 'origin/master'

Conflicts:
	themeforest-7986783-bleecker-responsive-retinaready-html5-portfolio/www/actu_fancybox.php