Resolved Toroidal Orbifolds and their Orientifolds