Merge branch 'master' into upstream-master

Conflicts:
	code/SiteTreeContentReview.php

code/ContentReviewEmails.php

@@ -31,7 +31,7 @@ class ContentReviewEmails extends DailyTask {
 					$email->setTemplate('ContentReviewEmails');
 					$email->setSubject($subject);
 					$email->populateTemplate(array(
-						"PageCMSLink" => "admin/show/".$page->ID,
+						"PageCMSLink" => "admin/pages/edit/show/".$page->ID,
 						"Recipient" => $recipient,
 						"Sender" => $sender,
 						"Page" => $page,

code/SiteTreeContentReview.php

@@ -42,7 +42,7 @@ class SiteTreeContentReview extends DataExtension implements PermissionProvider
 				DateField::create(
 					"NextReviewDate", 
 					_t("SiteTreeCMSWorkflow.NEXTREVIEWDATE", "Next review date (leave blank for no review)")
-				)->setConfig('showcalendar', true),
+				)->setConfig('showcalendar', true)->setConfig('dateformat', 'yyyy-MM-dd')->setConfig('datavalueformat', 'yyyy-MM-dd'),
 				new DropdownField("ReviewPeriodDays", _t("SiteTreeCMSWorkflow.REVIEWFREQUENCY",
 					"Review frequency (the review date will be set to this far in the future whenever the page is published.)"), array(
 					0 => "No automatic review date",