famo.us
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/directives/sv-photo-gallery.html
	app/views/directives/sv-photo-gallery.jade