Foto de fox cambiada
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/themes/3791671/Fox.jpg
Disney theme