photo grid en fancybox
lightbox
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/app/directives/fancybox.js
	public/app/photo/folder-file-list.html
	public/app/photo/folder-file-list.jade