removed fancybox
Merge branch 'master' of github.com:kiasaki/sw-quebec-2014

Conflicts:
	public/javascripts/album.js
	views/album_show.jade
cheap comment