fancybox less
Merge branch 'master' into angular

Conflicts:
	public/css/admin.css