Deligne Cohomology for Orbifolds, discrete torsion and B-fields