More errors

Conflicts:

	app/assets/javascripts/lib/components/lightbox.js