fancybox less
Merge branch 'master' into demo

Conflicts:
	public/css/admin.css