Display correct day of the week with negative UTC offset

A duplicate subtraction of the UTC offset and DST time caused the creation
of an incorrect timestamp. In return this caused us to go back too far and
therefore moved us back one day.

Conflicts:
	root/portal/modules/portal_calendar.php

root/portal/modules/portal_calendar.php

@@ -591,6 +591,11 @@ class portal_calendar_module
 	**/
 	private function makeTimestamp($date)
 	{
+<<<<<<< HEAD
+=======
+		global $user;
+
+>>>>>>> 36903cb... Display correct day of the week with negative UTC offset
 		$this->stamp = strtotime($date);
 		return ($this->stamp);
 	}