diff --git a/Pages/Admin/ManageResourcesPage.php b/Pages/Admin/ManageResourcesPage.php
index 3c0a5f475..57a122761 100644
--- a/Pages/Admin/ManageResourcesPage.php
+++ b/Pages/Admin/ManageResourcesPage.php
@@ -27,1110 +27,1133 @@
 
 interface IUpdateResourcePage
 {
-    /**
-     * @return int
-     */
-    public function GetResourceId();
-
-    /**
-     * @return int
-     */
-    public function GetScheduleId();
-
-    /**
-     * @return string
-     */
-    public function GetResourceName();
-
-    /**
-     * @return UploadedFile
-     */
-    public function GetUploadedImage();
-
-    /**
-     * @return string
-     */
-    public function GetLocation();
-
-    /**
-     * @return string
-     */
-    public function GetContact();
-
-    /**
-     * @return string
-     */
-    public function GetDescription();
-
-    /**
-     * @return string
-     */
-    public function GetNotes();
-
-    /**
-     * @return string
-     */
-    public function GetMinimumDuration();
-
-    /**
-     * @return string
-     */
-    public function GetMaximumDuration();
-
-    /**
-     * @return string
-     */
-    public function GetBufferTime();
-
-    /**
-     * @return string
-     */
-    public function GetAllowMultiday();
-
-    /**
-     * @return string
-     */
-    public function GetBulkAllowMultiday();
-
-    /**
-     * @return string
-     */
-    public function GetRequiresApproval();
-
-    /**
-     * @return string
-     */
-    public function GetBulkRequiresApproval();
-
-    /**
-     * @return string
-     */
-    public function GetAutoAssign();
-
-    /**
-     * @return string
-     */
-    public function GetBulkAutoAssign();
-
-    /**
-     * @return string
-     */
-    public function GetAutoAssignClear();
-
-    /**
-     * @return string
-     */
-    public function GetAllowSubscriptions();
-
-    /**
-     * @return string
-     */
-    public function GetStartNoticeMinutesAdd();
-
-    /**
-     * @return string
-     */
-    public function GetStartNoticeMinutesUpdate();
-
-    /**
-     * @return string
-     */
-    public function GetStartNoticeMinutesDelete();
-
-    /**
-     * @return string
-     */
-    public function GetEndNoticeMinutes();
-
-    /**
-     * @return string
-     */
-    public function GetMaxParticipants();
-
-    /**
-     * @return int
-     */
-    public function GetAdminGroupId();
-
-    /**
-     * @return int
-     */
-    public function GetSortOrder();
-
-    /**
-     * @return int
-     */
-    public function GetResourceTypeId();
+	/**
+	 * @return int
+	 */
+	public function GetResourceId();
+
+	/**
+	 * @return int
+	 */
+	public function GetScheduleId();
+
+	/**
+	 * @return string
+	 */
+	public function GetResourceName();
+
+	/**
+	 * @return UploadedFile
+	 */
+	public function GetUploadedImage();
+
+	/**
+	 * @return string
+	 */
+	public function GetLocation();
+
+	/**
+	 * @return string
+	 */
+	public function GetContact();
+
+	/**
+	 * @return string
+	 */
+	public function GetDescription();
+
+	/**
+	 * @return string
+	 */
+	public function GetNotes();
+
+	/**
+	 * @return string
+	 */
+	public function GetMinimumDuration();
+
+	/**
+	 * @return string
+	 */
+	public function GetMaximumDuration();
+
+	/**
+	 * @return string
+	 */
+	public function GetBufferTime();
+
+	/**
+	 * @return string
+	 */
+	public function GetAllowMultiday();
+
+	/**
+	 * @return string
+	 */
+	public function GetBulkAllowMultiday();
+
+	/**
+	 * @return string
+	 */
+	public function GetRequiresApproval();
+
+	/**
+	 * @return string
+	 */
+	public function GetBulkRequiresApproval();
+
+	/**
+	 * @return string
+	 */
+	public function GetAutoAssign();
+
+	/**
+	 * @return string
+	 */
+	public function GetBulkAutoAssign();
+
+	/**
+	 * @return string
+	 */
+	public function GetAutoAssignClear();
+
+	/**
+	 * @return string
+	 */
+	public function GetAllowSubscriptions();
+
+	/**
+	 * @return string
+	 */
+	public function GetStartNoticeMinutesAdd();
+
+	/**
+	 * @return string
+	 */
+	public function GetStartNoticeMinutesUpdate();
+
+	/**
+	 * @return string
+	 */
+	public function GetStartNoticeMinutesDelete();
+
+	/**
+	 * @return string
+	 */
+	public function GetEndNoticeMinutes();
+
+	/**
+	 * @return string
+	 */
+	public function GetMaxParticipants();
+
+	/**
+	 * @return int
+	 */
+	public function GetAdminGroupId();
+
+	/**
+	 * @return int
+	 */
+	public function GetSortOrder();
+
+	/**
+	 * @return int
+	 */
+	public function GetResourceTypeId();
+
+	/**
+	 * @return bool
+	 */
+	public function GetAllowConcurrentReservations();
+
+	/**
+	 * @return int
+	 */
+	public function GetMaxConcurrentReservations();
+}
+
+interface IManageResourcesPage extends IUpdateResourcePage, IActionPage, IPageable
+{
+	/**
+	 * @param BookableResource[] $resources
+	 */
+	public function BindResources($resources);
+
+	/**
+	 * @param array $scheduleList array of (id, schedule name)
+	 */
+	public function BindSchedules($scheduleList);
+
+	/**
+	 * @param Schedule[] $schedules
+	 */
+	public function AllSchedules($schedules);
+
+	/**
+	 * @param $adminGroups GroupItemView[]|array
+	 * @return void
+	 */
+	public function BindAdminGroups($adminGroups);
+
+	/**
+	 * @param $attributeList CustomAttribute[]
+	 */
+	public function BindAttributeList($attributeList);
+
+	/**
+	 * @return AttributeFormElement[]|array
+	 */
+	public function GetAttributes();
+
+	/**
+	 * @param $resources AdminResourceJson[]
+	 */
+	public function SetResourcesJson($resources);
+
+	/**
+	 * @param $response mixed
+	 */
+	public function SetJsonResponse($response);
+
+	/**
+	 * @param $resourceTypes ResourceType[]
+	 */
+	public function BindResourceTypes($resourceTypes);
+
+	/**
+	 * @param $reasons ResourceStatusReason[]
+	 */
+	public function BindResourceStatusReasons($reasons);
+
+	/**
+	 * @return int
+	 */
+	public function GetStatusId();
+
+	/**
+	 * @return int
+	 */
+	public function GetStatusReasonId();
+
+	/**
+	 * @return string
+	 */
+	public function GetNewStatusReason();
+
+	/**
+	 * @param Attribute[] $attributeFilters
+	 */
+	public function BindAttributeFilters($attributeFilters);
+
+	/**
+	 * @return bool
+	 */
+	public function FilterButtonPressed();
+
+	/**
+	 * @param ResourceFilterValues $value
+	 */
+	public function SetFilterValues($value);
+
+	/**
+	 * @return ResourceFilterValues
+	 */
+	public function GetFilterValues();
+
+	/**
+	 * @return int[]
+	 */
+	public function GetBulkUpdateResourceIds();
+
+	/**
+	 * @return bool
+	 */
+	public function GetMinimumDurationNone();
+
+	/**
+	 * @return bool
+	 */
+	public function GetMaximumDurationNone();
+
+	/**
+	 * @return bool
+	 */
+	public function GetBufferTimeNone();
+
+	/**
+	 * @return bool
+	 */
+	public function GetStartNoticeNoneAdd();
+
+	/**
+	 * @return bool
+	 */
+	public function GetStartNoticeNoneUpdate();
+
+	/**
+	 * @return bool
+	 */
+	public function GetStartNoticeNoneDelete();
+
+	/**
+	 * @return bool
+	 */
+	public function GetEndNoticeNone();
+
+	/**
+	 * @return int
+	 */
+	public function GetPermissionUserId();
+
+	/**
+	 * @return int
+	 */
+	public function GetPermissionGroupId();
+
+	/**
+	 * @return int
+	 */
+	public function GetPermissionType();
+
+	/**
+	 * @return string
+	 */
+	public function GetValue();
+
+	/**
+	 * @return string
+	 */
+	public function GetName();
+
+	/**
+	 * @return string
+	 */
+	public function GetAttributeId();
+
+	/**
+	 * @param BookableResource $resource
+	 */
+	public function BindUpdatedDuration($resource);
+
+	/**
+	 * @param BookableResource $resource
+	 */
+	public function BindUpdatedCapacity($resource);
+
+	/**
+	 * @param BookableResource $resource
+	 */
+	public function BindUpdatedAccess($resource);
+
+	/**
+	 * @param BookableResource $resource
+	 * @param ResourceGroup[] $groupList
+	 */
+	public function BindUpdatedResourceGroups($resource, $groupList);
+
+	public function SetAttributeValueAsJson($attributeValue);
+
+	/**
+	 * @param ResourceGroupTree $resourceGroups
+	 */
+	public function BindResourceGroups(ResourceGroupTree $resourceGroups);
+
+	/**
+	 * @return int[]
+	 */
+	public function GetResourceGroupIds();
+
+	/**
+	 * @return string
+	 */
+	public function GetColor();
+
+	/**
+	 * @return bool
+	 */
+	public function GetEnableCheckin();
+
+	/**
+	 * @return bool
+	 */
+	public function GetBulkEnableCheckin();
+
+	/**
+	 * @return string
+	 */
+	public function GetAutoReleaseMinutes();
+
+	/**
+	 * @return int
+	 */
+	public function GetCredits();
+
+	/**
+	 * @return int
+	 */
+	public function GetPeakCredits();
+
+	public function BindUpdatedResourceCredits(BookableResource $resource);
+
+	public function ShowQRCode($qrCodeImageUrl, $resourceName);
+
+	/**
+	 * @return UploadedFile
+	 */
+	public function GetImportFile();
+
+	/**
+	 * @param CustomAttribute[] $attributes
+	 */
+	public function ShowTemplateCSV($attributes);
+
+	/**
+	 * @param CsvImportResult $importResult
+	 */
+	public function SetImportResult($importResult);
+
+	public function ShowExportCsv();
+
+	/**
+	 * @return bool
+	 */
+	public function GetMaxParticipantsUnlimited();
+
+	/**
+	 * @return bool
+	 */
+	public function GetUpdateOnImport();
+
+	/**
+	 * @param BookableResource $resource
+	 */
+	public function BindResourceImages(BookableResource $resource);
+
+	/**
+	 * @return string
+	 */
+	public function GetImageName();
+
+	/**
+	 * @param GroupPermissionItemView[] $groups
+	 */
+	public function BindGroupPermissions($groups);
+
+	/**
+	 * @param UserPermissionItemView[]|PageableData $users
+	 */
+	public function BindUserPermissions($users);
+
+	/**
+	 * @param BookableResource $resource
+	 */
+	public function DisplayPublicSettings($resource);
+
+	/**
+	 * @return bool
+	 */
+	public function GetAllowConcurrentReservations();
+
+	/**
+	 * @return int
+	 */
+	public function GetBulkAllowConcurrentReservations();
+
+	/**
+	 * @return int
+	 */
+	public function GetMaxConcurrentReservations();
+
+	/**
+	 * @return bool
+	 */
+	public function SendStatusChangeMessage();
+
+	/**
+	 * @return int
+	 */
+	public function StatusChangeDays();
+
+	/**
+	 * @return string
+	 */
+	public function GetStatusChangeMessage();
+}
+
+class ManageResourcesPage extends ActionPage implements IManageResourcesPage
+{
+	/**
+	 * @var ManageResourcesPresenter
+	 */
+	protected $presenter;
+	protected $pageablePage;
+
+	public function __construct()
+	{
+		parent::__construct('ManageResources', 1);
+		$this->presenter = new ManageResourcesPresenter(
+				$this,
+				new ResourceRepository(),
+				new ScheduleRepository(),
+				new ImageFactory(),
+				new GroupRepository(),
+				new AttributeService(new AttributeRepository()),
+				new UserPreferenceRepository(),
+				new ReservationViewRepository()
+		);
+
+		$this->pageablePage = new PageablePage($this);
+		$this->Set('YesNoOptions',
+				   array(
+						   '1' => Resources::GetInstance()->GetString('Yes'),
+						   '0' => Resources::GetInstance()->GetString('No'))
+		);
+		$this->Set('YesNoUnchangedOptions',
+				   array('-1' => Resources::GetInstance()->GetString('Unchanged'),
+						   '1' => Resources::GetInstance()->GetString('Yes'),
+						   '0' => Resources::GetInstance()->GetString('No'))
+		);
+
+		$this->Set('CreditsEnabled', Configuration::Instance()->GetSectionKey(ConfigSection::CREDITS, ConfigKeys::CREDITS_ENABLED, new BooleanConverter()));
+
+		$url = $this->server->GetUrl();
+		$exportUrl = BookedStringHelper::Contains($url, '?') ? $url . '&dr=export' : $this->server->GetRequestUri() . '?dr=export';
+		$this->Set('ExportUrl', $exportUrl);
+	}
+
+	public function ProcessPageLoad()
+	{
+		$this->presenter->PageLoad();
+
+		$this->Display('Admin/Resources/manage_resources.tpl');
+	}
+
+	/**
+	 * @return int
+	 */
+	function GetPageNumber()
+	{
+		return $this->pageablePage->GetPageNumber();
+	}
+
+	/**
+	 * @return int
+	 */
+	function GetPageSize()
+	{
+		$pageSize = $this->pageablePage->GetPageSize();
+
+		if ($pageSize > 10)
+		{
+			return 10;
+		}
+		return $pageSize;
+	}
+
+	/**
+	 * @param PageInfo $pageInfo
+	 * @return void
+	 */
+	function BindPageInfo(PageInfo $pageInfo)
+	{
+		$this->pageablePage->BindPageInfo($pageInfo);
+	}
+
+	public function BindResources($resources)
+	{
+		$this->Set('Resources', $resources);
+	}
+
+	public function BindSchedules($schedules)
+	{
+		$this->Set('Schedules', $schedules);
+	}
+
+	public function AllSchedules($schedules)
+	{
+		$this->Set('AllSchedules', $schedules);
+	}
+
+	public function ProcessAction()
+	{
+		$this->presenter->ProcessAction();
+	}
+
+	public function GetResourceId()
+	{
+		$id = $this->GetQuerystring(QueryStringKeys::RESOURCE_ID);
+		if (empty($id))
+		{
+			$id = $this->GetForm(FormKeys::PK);
+		}
+
+		return $id;
+	}
+
+	public function GetScheduleId()
+	{
+		return $this->GetForm(FormKeys::SCHEDULE_ID);
+	}
+
+	public function GetValue()
+	{
+		return $this->GetForm(FormKeys::VALUE);
+	}
+
+	public function GetName()
+	{
+		return $this->GetForm(FormKeys::NAME);
+	}
+
+	public function GetResourceName()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_NAME);
+	}
+
+	public function GetUploadedImage()
+	{
+		return $this->server->GetFile(FormKeys::RESOURCE_IMAGE);
+	}
+
+	public function GetLocation()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_LOCATION);
+	}
+
+	public function GetContact()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_CONTACT);
+	}
+
+	public function GetDescription()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_DESCRIPTION);
+	}
+
+	public function GetNotes()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_NOTES);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetMinimumDuration()
+	{
+		return $this->GetForm(FormKeys::MIN_DURATION);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetMaximumDuration()
+	{
+		return $this->GetForm(FormKeys::MAX_DURATION);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetBufferTime()
+	{
+		return $this->GetForm(FormKeys::BUFFER_TIME);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetAllowMultiday()
+	{
+		return $this->GetCheckbox(FormKeys::ALLOW_MULTIDAY);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetRequiresApproval()
+	{
+		return $this->GetCheckbox(FormKeys::REQUIRES_APPROVAL);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetAutoAssign()
+	{
+		return $this->GetCheckbox(FormKeys::AUTO_ASSIGN);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetAutoAssignClear()
+	{
+		return $this->GetForm(FormKeys::AUTO_ASSIGN_CLEAR);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetStartNoticeMinutesAdd()
+	{
+		return $this->GetForm(FormKeys::MIN_NOTICE_ADD);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetStartNoticeMinutesUpdate()
+	{
+		return $this->GetForm(FormKeys::MIN_NOTICE_UPDATE);
+	}
 
 	/**
-	 * @return bool
+	 * @return string
+	 */
+	public function GetStartNoticeMinutesDelete()
+	{
+		return $this->GetForm(FormKeys::MIN_NOTICE_DELETE);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetEndNoticeMinutes()
+	{
+		return $this->GetForm(FormKeys::MAX_NOTICE);
+	}
+
+	/**
+	 * @return string
 	 */
-    public function GetAllowConcurrentReservations();
+	public function GetMaxParticipants()
+	{
+		return $this->GetForm(FormKeys::MAX_PARTICIPANTS);
+	}
 
 	/**
 	 * @return int
 	 */
-    public function GetMaxConcurrentReservations();
-}
+	public function GetAdminGroupId()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_ADMIN_GROUP_ID);
+	}
 
-interface IManageResourcesPage extends IUpdateResourcePage, IActionPage, IPageable
-{
-    /**
-     * @param BookableResource[] $resources
-     */
-    public function BindResources($resources);
-
-    /**
-     * @param array $scheduleList array of (id, schedule name)
-     */
-    public function BindSchedules($scheduleList);
-
-    /**
-     * @param Schedule[] $schedules
-     */
-    public function AllSchedules($schedules);
-
-    /**
-     * @param $adminGroups GroupItemView[]|array
-     * @return void
-     */
-    public function BindAdminGroups($adminGroups);
-
-    /**
-     * @param $attributeList CustomAttribute[]
-     */
-    public function BindAttributeList($attributeList);
-
-    /**
-     * @return AttributeFormElement[]|array
-     */
-    public function GetAttributes();
-
-    /**
-     * @param $resources AdminResourceJson[]
-     */
-    public function SetResourcesJson($resources);
-
-    /**
-     * @param $response mixed
-     */
-    public function SetJsonResponse($response);
-
-    /**
-     * @param $resourceTypes ResourceType[]
-     */
-    public function BindResourceTypes($resourceTypes);
-
-    /**
-     * @param $reasons ResourceStatusReason[]
-     */
-    public function BindResourceStatusReasons($reasons);
-
-    /**
-     * @return int
-     */
-    public function GetStatusId();
-
-    /**
-     * @return int
-     */
-    public function GetStatusReasonId();
-
-    /**
-     * @return string
-     */
-    public function GetNewStatusReason();
-
-    /**
-     * @param Attribute[] $attributeFilters
-     */
-    public function BindAttributeFilters($attributeFilters);
-
-    /**
-     * @return bool
-     */
-    public function FilterButtonPressed();
-
-    /**
-     * @param ResourceFilterValues $value
-     */
-    public function SetFilterValues($value);
-
-    /**
-     * @return ResourceFilterValues
-     */
-    public function GetFilterValues();
-
-    /**
-     * @return int[]
-     */
-    public function GetBulkUpdateResourceIds();
-
-    /**
-     * @return bool
-     */
-    public function GetMinimumDurationNone();
-
-    /**
-     * @return bool
-     */
-    public function GetMaximumDurationNone();
-
-    /**
-     * @return bool
-     */
-    public function GetBufferTimeNone();
-
-    /**
-     * @return bool
-     */
-    public function GetStartNoticeNoneAdd();
-
-    /**
-     * @return bool
-     */
-    public function GetStartNoticeNoneUpdate();
-
-    /**
-     * @return bool
-     */
-    public function GetStartNoticeNoneDelete();
-
-    /**
-     * @return bool
-     */
-    public function GetEndNoticeNone();
-
-    /**
-     * @return int
-     */
-    public function GetPermissionUserId();
-
-    /**
-     * @return int
-     */
-    public function GetPermissionGroupId();
-
-    /**
-     * @return int
-     */
-    public function GetPermissionType();
-
-    /**
-     * @return string
-     */
-    public function GetValue();
-
-    /**
-     * @return string
-     */
-    public function GetName();
-
-    /**
-     * @return string
-     */
-    public function GetAttributeId();
-
-    /**
-     * @param BookableResource $resource
-     */
-    public function BindUpdatedDuration($resource);
-
-    /**
-     * @param BookableResource $resource
-     */
-    public function BindUpdatedCapacity($resource);
-
-    /**
-     * @param BookableResource $resource
-     */
-    public function BindUpdatedAccess($resource);
-
-    /**
-     * @param BookableResource $resource
-     * @param ResourceGroup[] $groupList
-     */
-    public function BindUpdatedResourceGroups($resource, $groupList);
-
-    public function SetAttributeValueAsJson($attributeValue);
-
-    /**
-     * @param ResourceGroupTree $resourceGroups
-     */
-    public function BindResourceGroups(ResourceGroupTree $resourceGroups);
-
-    /**
-     * @return int[]
-     */
-    public function GetResourceGroupIds();
-
-    /**
-     * @return string
-     */
-    public function GetColor();
-
-    /**
-     * @return bool
-     */
-    public function GetEnableCheckin();
-
-    /**
-     * @return bool
-     */
-    public function GetBulkEnableCheckin();
-
-    /**
-     * @return string
-     */
-    public function GetAutoReleaseMinutes();
-
-    /**
-     * @return int
-     */
-    public function GetCredits();
-
-    /**
-     * @return int
-     */
-    public function GetPeakCredits();
-
-    public function BindUpdatedResourceCredits(BookableResource $resource);
-
-    public function ShowQRCode($qrCodeImageUrl, $resourceName);
-
-    /**
-     * @return UploadedFile
-     */
-    public function GetImportFile();
-
-    /**
-     * @param CustomAttribute[] $attributes
-     */
-    public function ShowTemplateCSV($attributes);
-
-    /**
-     * @param CsvImportResult $importResult
-     */
-    public function SetImportResult($importResult);
-
-    public function ShowExportCsv();
-
-    /**
-     * @return bool
-     */
-    public function GetMaxParticipantsUnlimited();
-
-    /**
-     * @return bool
-     */
-    public function GetUpdateOnImport();
-
-    /**
-     * @param BookableResource $resource
-     */
-    public function BindResourceImages(BookableResource $resource);
-
-    /**
-     * @return string
-     */
-    public function GetImageName();
-
-    /**
-     * @param GroupPermissionItemView[] $groups
-     */
-    public function BindGroupPermissions($groups);
-
-    /**
-     * @param UserPermissionItemView[]|PageableData $users
-     */
-    public function BindUserPermissions($users);
-
-    /**
-     * @param BookableResource $resource
-     */
-    public function DisplayPublicSettings($resource);
+	/**
+	 * @param $adminGroups GroupItemView[]|array
+	 * @return void
+	 */
+	function BindAdminGroups($adminGroups)
+	{
+		$this->Set('AdminGroups', $adminGroups);
+		$groupLookup = array();
+		foreach ($adminGroups as $group)
+		{
+			$groupLookup[$group->Id] = $group;
+		}
+		$this->Set('GroupLookup', $groupLookup);
+	}
+
+	public function ProcessDataRequest($dataRequest)
+	{
+		$this->presenter->ProcessDataRequest($dataRequest);
+	}
 
 	/**
-	 * @return bool
+	 * @param $attributeList CustomAttribute[]
+	 */
+	public function BindAttributeList($attributeList)
+	{
+		$this->Set('AttributeList', $attributeList);
+	}
+
+	/**
+	 * @return AttributeFormElement[]|array
 	 */
-    public function GetAllowConcurrentReservations();
+	public function GetAttributes()
+	{
+		return AttributeFormParser::GetAttributes($this->GetForm(FormKeys::ATTRIBUTE_PREFIX));
+	}
 
-    /**
+	/**
 	 * @return int
 	 */
-    public function GetBulkAllowConcurrentReservations();
+	public function GetSortOrder()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_SORT_ORDER);
+	}
+
+	/**
+	 * @param $resources AdminResourceJson[]
+	 */
+	public function SetResourcesJson($resources)
+	{
+		$this->SetJson($resources);
+	}
+
+	public function SetJsonResponse($response)
+	{
+		parent::SetJson($response);
+	}
+
+	/**
+	 * @param $resourceTypes ResourceType[]
+	 */
+	public function BindResourceTypes($resourceTypes)
+	{
+		$this->Set('ResourceTypes', $resourceTypes);
+	}
 
 	/**
 	 * @return int
 	 */
-    public function GetMaxConcurrentReservations();
-}
+	public function GetResourceTypeId()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_TYPE_ID);
+	}
 
-class ManageResourcesPage extends ActionPage implements IManageResourcesPage
-{
-    /**
-     * @var ManageResourcesPresenter
-     */
-    protected $presenter;
-    protected $pageablePage;
-
-    public function __construct()
-    {
-        parent::__construct('ManageResources', 1);
-        $this->presenter = new ManageResourcesPresenter(
-            $this,
-            new ResourceRepository(),
-            new ScheduleRepository(),
-            new ImageFactory(),
-            new GroupRepository(),
-            new AttributeService(new AttributeRepository()),
-            new UserPreferenceRepository()
-        );
-
-        $this->pageablePage = new PageablePage($this);
-        $this->Set('YesNoOptions',
-            array(
-                '1' => Resources::GetInstance()->GetString('Yes'),
-                '0' => Resources::GetInstance()->GetString('No'))
-        );
-        $this->Set('YesNoUnchangedOptions',
-            array('-1' => Resources::GetInstance()->GetString('Unchanged'),
-                '1' => Resources::GetInstance()->GetString('Yes'),
-                '0' => Resources::GetInstance()->GetString('No'))
-        );
-
-        $this->Set('CreditsEnabled', Configuration::Instance()->GetSectionKey(ConfigSection::CREDITS, ConfigKeys::CREDITS_ENABLED, new BooleanConverter()));
-
-        $url = $this->server->GetUrl();
-        $exportUrl = BookedStringHelper::Contains($url, '?') ? $url . '&dr=export' : $this->server->GetRequestUri() . '?dr=export';
-        $this->Set('ExportUrl', $exportUrl);
-    }
-
-    public function ProcessPageLoad()
-    {
-        $this->presenter->PageLoad();
-
-        $this->Display('Admin/Resources/manage_resources.tpl');
-    }
-
-    /**
-     * @return int
-     */
-    function GetPageNumber()
-    {
-        return $this->pageablePage->GetPageNumber();
-    }
-
-    /**
-     * @return int
-     */
-    function GetPageSize()
-    {
-        $pageSize = $this->pageablePage->GetPageSize();
-
-        if ($pageSize > 10) {
-            return 10;
-        }
-        return $pageSize;
-    }
-
-    /**
-     * @param PageInfo $pageInfo
-     * @return void
-     */
-    function BindPageInfo(PageInfo $pageInfo)
-    {
-        $this->pageablePage->BindPageInfo($pageInfo);
-    }
-
-    public function BindResources($resources)
-    {
-        $this->Set('Resources', $resources);
-    }
-
-    public function BindSchedules($schedules)
-    {
-        $this->Set('Schedules', $schedules);
-    }
-
-    public function AllSchedules($schedules)
-    {
-        $this->Set('AllSchedules', $schedules);
-    }
-
-    public function ProcessAction()
-    {
-        $this->presenter->ProcessAction();
-    }
-
-    public function GetResourceId()
-    {
-        $id = $this->GetQuerystring(QueryStringKeys::RESOURCE_ID);
-        if (empty($id)) {
-            $id = $this->GetForm(FormKeys::PK);
-        }
-
-        return $id;
-    }
-
-    public function GetScheduleId()
-    {
-        return $this->GetForm(FormKeys::SCHEDULE_ID);
-    }
-
-    public function GetValue()
-    {
-        return $this->GetForm(FormKeys::VALUE);
-    }
-
-    public function GetName()
-    {
-        return $this->GetForm(FormKeys::NAME);
-    }
-
-    public function GetResourceName()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_NAME);
-    }
-
-    public function GetUploadedImage()
-    {
-        return $this->server->GetFile(FormKeys::RESOURCE_IMAGE);
-    }
-
-    public function GetLocation()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_LOCATION);
-    }
-
-    public function GetContact()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_CONTACT);
-    }
-
-    public function GetDescription()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_DESCRIPTION);
-    }
-
-    public function GetNotes()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_NOTES);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetMinimumDuration()
-    {
-        return $this->GetForm(FormKeys::MIN_DURATION);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetMaximumDuration()
-    {
-        return $this->GetForm(FormKeys::MAX_DURATION);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetBufferTime()
-    {
-        return $this->GetForm(FormKeys::BUFFER_TIME);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetAllowMultiday()
-    {
-        return $this->GetCheckbox(FormKeys::ALLOW_MULTIDAY);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetRequiresApproval()
-    {
-        return $this->GetCheckbox(FormKeys::REQUIRES_APPROVAL);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetAutoAssign()
-    {
-        return $this->GetCheckbox(FormKeys::AUTO_ASSIGN);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetAutoAssignClear()
-    {
-        return $this->GetForm(FormKeys::AUTO_ASSIGN_CLEAR);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetStartNoticeMinutesAdd()
-    {
-        return $this->GetForm(FormKeys::MIN_NOTICE_ADD);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetStartNoticeMinutesUpdate()
-    {
-        return $this->GetForm(FormKeys::MIN_NOTICE_UPDATE);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetStartNoticeMinutesDelete()
-    {
-        return $this->GetForm(FormKeys::MIN_NOTICE_DELETE);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetEndNoticeMinutes()
-    {
-        return $this->GetForm(FormKeys::MAX_NOTICE);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetMaxParticipants()
-    {
-        return $this->GetForm(FormKeys::MAX_PARTICIPANTS);
-    }
-
-    /**
-     * @return int
-     */
-    public function GetAdminGroupId()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_ADMIN_GROUP_ID);
-    }
-
-    /**
-     * @param $adminGroups GroupItemView[]|array
-     * @return void
-     */
-    function BindAdminGroups($adminGroups)
-    {
-        $this->Set('AdminGroups', $adminGroups);
-        $groupLookup = array();
-        foreach ($adminGroups as $group) {
-            $groupLookup[$group->Id] = $group;
-        }
-        $this->Set('GroupLookup', $groupLookup);
-    }
-
-    public function ProcessDataRequest($dataRequest)
-    {
-        $this->presenter->ProcessDataRequest($dataRequest);
-    }
-
-    /**
-     * @param $attributeList CustomAttribute[]
-     */
-    public function BindAttributeList($attributeList)
-    {
-        $this->Set('AttributeList', $attributeList);
-    }
-
-    /**
-     * @return AttributeFormElement[]|array
-     */
-    public function GetAttributes()
-    {
-        return AttributeFormParser::GetAttributes($this->GetForm(FormKeys::ATTRIBUTE_PREFIX));
-    }
-
-    /**
-     * @return int
-     */
-    public function GetSortOrder()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_SORT_ORDER);
-    }
-
-    /**
-     * @param $resources AdminResourceJson[]
-     */
-    public function SetResourcesJson($resources)
-    {
-        $this->SetJson($resources);
-    }
-
-    public function SetJsonResponse($response)
-    {
-        parent::SetJson($response);
-    }
-
-    /**
-     * @param $resourceTypes ResourceType[]
-     */
-    public function BindResourceTypes($resourceTypes)
-    {
-        $this->Set('ResourceTypes', $resourceTypes);
-    }
-
-    /**
-     * @return int
-     */
-    public function GetResourceTypeId()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_TYPE_ID);
-    }
-
-    /**
-     * @param $reasons ResourceStatusReason[]
-     */
-    public function BindResourceStatusReasons($reasons)
-    {
-        $this->Set('StatusReasons', $reasons);
-    }
-
-    public function GetStatusId()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_STATUS_ID);
-    }
-
-    public function GetStatusReasonId()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_STATUS_REASON_ID);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetNewStatusReason()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_STATUS_REASON);
-    }
-
-    public function FilterButtonPressed()
-    {
-        return count($_GET) > 0;
-    }
-
-    public function SetFilterValues($values)
-    {
-        $this->Set('ResourceNameFilter', $values->ResourceNameFilter);
-        $this->Set('ScheduleIdFilter', $values->ScheduleIdFilter);
-        $this->Set('ResourceTypeFilter', $values->ResourceTypeFilter);
-        $this->Set('ResourceStatusFilterId', $values->ResourceStatusFilterId == '' ? '' : intval($values->ResourceStatusFilterId));
-        $this->Set('ResourceStatusReasonFilterId', $values->ResourceStatusReasonFilterId  == '' ? '' : intval($values->ResourceStatusReasonFilterId));
-        $this->Set('CapacityFilter', $values->CapacityFilter);
-        $this->Set('RequiresApprovalFilter', $values->RequiresApprovalFilter);
-        $this->Set('AutoPermissionFilter', $values->AutoPermissionFilter);
-        $this->Set('AllowMultiDayFilter', $values->AllowMultiDayFilter);
-    }
-
-    public function GetFilterValues()
-    {
-        $filterValues = new ResourceFilterValues();
-
-        $filterValues->ResourceNameFilter = $this->GetQuerystring(FormKeys::RESOURCE_NAME);
-        $filterValues->ScheduleIdFilter = $this->GetQuerystring(FormKeys::SCHEDULE_ID);
-        $filterValues->ResourceTypeFilter = $this->GetQuerystring(FormKeys::RESOURCE_TYPE_ID);
-        $filterValues->ResourceStatusFilterId = $this->GetQuerystring(FormKeys::RESOURCE_STATUS_ID);
-        $filterValues->ResourceStatusReasonFilterId = $this->GetQuerystring(FormKeys::RESOURCE_STATUS_REASON_ID);
-        $filterValues->CapacityFilter = $this->GetQuerystring(FormKeys::MAX_PARTICIPANTS);
-        $filterValues->RequiresApprovalFilter = $this->GetQuerystring(FormKeys::REQUIRES_APPROVAL);
-        $filterValues->AutoPermissionFilter = $this->GetQuerystring(FormKeys::AUTO_ASSIGN);
-        $filterValues->AllowMultiDayFilter = $this->GetQuerystring(FormKeys::ALLOW_MULTIDAY);
-        $filterValues->SetAttributes(AttributeFormParser::GetAttributes($this->GetQuerystring(FormKeys::ATTRIBUTE_PREFIX)));
-
-        return $filterValues;
-    }
-
-    public function BindAttributeFilters($attributeFilters)
-    {
-        $this->Set('AttributeFilters', $attributeFilters);
-    }
-
-    public function GetBulkUpdateResourceIds()
-    {
-        $resourceIds = $this->GetForm(FormKeys::RESOURCE_ID);
-        if (empty($resourceIds)) {
-            return array();
-        }
-
-        return $resourceIds;
-    }
-
-    public function GetAllowSubscriptions()
-    {
-        return $this->GetForm(FormKeys::ALLOW_CALENDAR_SUBSCRIPTIONS);
-    }
-
-    public function GetMinimumDurationNone()
-    {
-        return $this->GetCheckbox(FormKeys::MIN_DURATION_NONE);
-    }
-
-    public function GetMaximumDurationNone()
-    {
-        return $this->GetCheckbox(FormKeys::MAX_DURATION_NONE);
-    }
-
-    public function GetBufferTimeNone()
-    {
-        return $this->GetCheckbox(FormKeys::BUFFER_TIME_NONE);
-    }
-
-    public function GetStartNoticeNoneAdd()
-    {
-        return $this->GetCheckbox(FormKeys::MIN_NOTICE_NONE_ADD);
-    }
-
-    public function GetStartNoticeNoneUpdate()
-    {
-        return $this->GetCheckbox(FormKeys::MIN_NOTICE_NONE_UPDATE);
-    }
-
-    public function GetStartNoticeNoneDelete()
-    {
-        return $this->GetCheckbox(FormKeys::MIN_NOTICE_NONE_UPDATE);
-    }
-
-    public function GetEndNoticeNone()
-    {
-        return $this->GetCheckbox(FormKeys::MAX_NOTICE_NONE);
-    }
-
-    /**
-     * @param BookableResource $resource
-     */
-    public function BindUpdatedDuration($resource)
-    {
-        $this->Set('resource', $resource);
-        $this->Display('Admin/Resources/manage_resources_duration.tpl');
-    }
-
-    /**
-     * @param BookableResource $resource
-     */
-    public function BindUpdatedCapacity($resource)
-    {
-        $this->Set('resource', $resource);
-        $this->Display('Admin/Resources/manage_resources_capacity.tpl');
-    }
-
-    /**
-     * @param BookableResource $resource
-     */
-    public function BindUpdatedAccess($resource)
-    {
-        $this->Set('resource', $resource);
-        $this->Display('Admin/Resources/manage_resources_access.tpl');
-    }
-
-    /**
-     * @param BookableResource $resource
-     * @param ResourceGroup[] $groupList
-     */
-    public function BindUpdatedResourceGroups($resource, $groupList)
-    {
-        $this->Set('resource', $resource);
-        $this->Set('ResourceGroupList', $groupList);
-        $this->Display('Admin/Resources/manage_resources_groups.tpl');
-    }
-
-    /**
-     * @return string
-     */
-    public function GetAttributeId()
-    {
-        return $this->GetQuerystring(QueryStringKeys::ATTRIBUTE_ID);
-    }
-
-    public function SetAttributeValueAsJson($attributeValue)
-    {
-        $this->SetJson($attributeValue);
-    }
-
-    public function GetPermissionUserId()
-    {
-        return $this->GetForm(FormKeys::USER_ID);
-    }
-
-    public function GetPermissionGroupId()
-    {
-        return $this->GetForm(FormKeys::GROUP_ID);
-    }
-
-    public function GetPermissionType()
-    {
-        return $this->GetForm(FormKeys::PERMISSION_TYPE);
-    }
-
-    /**
-     * @param ResourceGroupTree $resourceGroups
-     */
-    public function BindResourceGroups(ResourceGroupTree $resourceGroups)
-    {
-        $this->Set('ResourceGroups', json_encode($resourceGroups->GetGroups(false)));
-        $groupList = $resourceGroups->GetGroupList(false);
-        $this->Set('ResourceGroupList', $groupList);
-    }
-
-    public function GetResourceGroupIds()
-    {
-        $groupIds = $this->GetForm(FormKeys::GROUP_ID);
-        if (empty($groupIds)) {
-            return array();
-        }
-
-        return $groupIds;
-    }
-
-    public function GetColor()
-    {
-        return $this->GetForm(FormKeys::RESERVATION_COLOR);
-    }
-
-    public function GetEnableCheckin()
-    {
-        return $this->GetCheckbox(FormKeys::ENABLE_CHECK_IN);
-    }
-
-    public function GetBulkEnableCheckin()
-    {
-        return $this->GetForm(FormKeys::ENABLE_CHECK_IN);
-    }
-
-    public function GetAutoReleaseMinutes()
-    {
-        return $this->GetForm(FormKeys::AUTO_RELEASE_MINUTES);
-    }
-
-    public function GetCredits()
-    {
-        return $this->GetForm(FormKeys::CREDITS);
-    }
-
-    public function GetPeakCredits()
-    {
-        return $this->GetForm(FormKeys::PEAK_CREDITS);
-    }
-
-    public function BindUpdatedResourceCredits(BookableResource $resource)
-    {
-        $this->Set('resource', $resource);
-        $this->Display('Admin/Resources/manage_resources_credits.tpl');
-    }
-
-    public function ShowQRCode($qrCodeImageUrl, $resourceName)
-    {
-        $this->Set('QRImageUrl', $qrCodeImageUrl);
-        $this->Set('ResourceName', $resourceName);
-
-        $this->Display('Admin/Resources/show_resource_qr.tpl');
-    }
-
-    /**
-     * @return string
-     */
-    public function GetBulkAllowMultiday()
-    {
-        return $this->GetForm(FormKeys::ALLOW_MULTIDAY);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetBulkRequiresApproval()
-    {
-        return $this->GetForm(FormKeys::REQUIRES_APPROVAL);
-    }
-
-    /**
-     * @return string
-     */
-    public function GetBulkAutoAssign()
-    {
-        return $this->GetForm(FormKeys::AUTO_ASSIGN);
-    }
-
-    public function GetImportFile()
-    {
-        return $this->server->GetFile(FormKeys::RESOURCE_IMPORT_FILE);
-    }
-
-    public function ShowTemplateCSV($attributes)
-    {
-        $this->Set('attributes', $attributes);
-        $this->DisplayCsv('Admin/Resources/import_resource_template_csv.tpl', 'resources.csv');
-    }
-
-    public function SetImportResult($importResult)
-    {
-        $this->SetJsonResponse($importResult);
-    }
-
-    public function ShowExportCsv()
-    {
-        $this->DisplayCsv('Admin/Resources/resources_csv.tpl', 'resources.csv');
-    }
-
-    public function GetMaxParticipantsUnlimited()
-    {
-        return $this->GetCheckbox(FormKeys::MAX_PARTICIPANTS_UNLIMITED);
-    }
-
-    public function GetUpdateOnImport()
-    {
-        return $this->GetCheckbox(FormKeys::UPDATE_ON_IMPORT);
-    }
-
-    public function BindResourceImages(BookableResource $resource)
-    {
-        $response = array('image' => null, 'images' => array());
-
-        if ($resource->HasImage()) {
-            $response = array('image' => $this->smarty->GetResourceImage(array('image' => $resource->GetImage()), $this->smarty), 'images' => array());
-        }
-        foreach ($resource->GetImages() as $image) {
-            $response['images'][] = $this->smarty->GetResourceImage(array('image' => $image), $this->smarty);
-        }
-        $this->SetJsonResponse($response);
-    }
-
-    public function GetImageName()
-    {
-        return $this->GetForm(FormKeys::RESOURCE_IMAGE);
-    }
-
-    public function BindGroupPermissions($groups)
-    {
-        $this->Set('Groups', $groups);
-        $this->Display('Admin/Resources/manage_resources_group_permissions.tpl');
-    }
-
-    public function BindUserPermissions($users)
-    {
-        $this->Set('Users', $users);
-        $this->Display('Admin/Resources/manage_resources_user_permissions.tpl');
-    }
-
-    public function DisplayPublicSettings($resource)
-    {
-       $this->Set('resource', $resource);
-       $this->Display('Admin/Resources/manage_resources_public.tpl');
-    }
+	/**
+	 * @param $reasons ResourceStatusReason[]
+	 */
+	public function BindResourceStatusReasons($reasons)
+	{
+		$this->Set('StatusReasons', $reasons);
+	}
+
+	public function GetStatusId()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_STATUS_ID);
+	}
+
+	public function GetStatusReasonId()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_STATUS_REASON_ID);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetNewStatusReason()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_STATUS_REASON);
+	}
+
+	public function FilterButtonPressed()
+	{
+		return count($_GET) > 0;
+	}
+
+	public function SetFilterValues($values)
+	{
+		$this->Set('ResourceNameFilter', $values->ResourceNameFilter);
+		$this->Set('ScheduleIdFilter', $values->ScheduleIdFilter);
+		$this->Set('ResourceTypeFilter', $values->ResourceTypeFilter);
+		$this->Set('ResourceStatusFilterId', $values->ResourceStatusFilterId == '' ? '' : intval($values->ResourceStatusFilterId));
+		$this->Set('ResourceStatusReasonFilterId', $values->ResourceStatusReasonFilterId == '' ? '' : intval($values->ResourceStatusReasonFilterId));
+		$this->Set('CapacityFilter', $values->CapacityFilter);
+		$this->Set('RequiresApprovalFilter', $values->RequiresApprovalFilter);
+		$this->Set('AutoPermissionFilter', $values->AutoPermissionFilter);
+		$this->Set('AllowMultiDayFilter', $values->AllowMultiDayFilter);
+	}
+
+	public function GetFilterValues()
+	{
+		$filterValues = new ResourceFilterValues();
+
+		$filterValues->ResourceNameFilter = $this->GetQuerystring(FormKeys::RESOURCE_NAME);
+		$filterValues->ScheduleIdFilter = $this->GetQuerystring(FormKeys::SCHEDULE_ID);
+		$filterValues->ResourceTypeFilter = $this->GetQuerystring(FormKeys::RESOURCE_TYPE_ID);
+		$filterValues->ResourceStatusFilterId = $this->GetQuerystring(FormKeys::RESOURCE_STATUS_ID);
+		$filterValues->ResourceStatusReasonFilterId = $this->GetQuerystring(FormKeys::RESOURCE_STATUS_REASON_ID);
+		$filterValues->CapacityFilter = $this->GetQuerystring(FormKeys::MAX_PARTICIPANTS);
+		$filterValues->RequiresApprovalFilter = $this->GetQuerystring(FormKeys::REQUIRES_APPROVAL);
+		$filterValues->AutoPermissionFilter = $this->GetQuerystring(FormKeys::AUTO_ASSIGN);
+		$filterValues->AllowMultiDayFilter = $this->GetQuerystring(FormKeys::ALLOW_MULTIDAY);
+		$filterValues->SetAttributes(AttributeFormParser::GetAttributes($this->GetQuerystring(FormKeys::ATTRIBUTE_PREFIX)));
+
+		return $filterValues;
+	}
+
+	public function BindAttributeFilters($attributeFilters)
+	{
+		$this->Set('AttributeFilters', $attributeFilters);
+	}
+
+	public function GetBulkUpdateResourceIds()
+	{
+		$resourceIds = $this->GetForm(FormKeys::RESOURCE_ID);
+		if (empty($resourceIds))
+		{
+			return array();
+		}
+
+		return $resourceIds;
+	}
+
+	public function GetAllowSubscriptions()
+	{
+		return $this->GetForm(FormKeys::ALLOW_CALENDAR_SUBSCRIPTIONS);
+	}
+
+	public function GetMinimumDurationNone()
+	{
+		return $this->GetCheckbox(FormKeys::MIN_DURATION_NONE);
+	}
+
+	public function GetMaximumDurationNone()
+	{
+		return $this->GetCheckbox(FormKeys::MAX_DURATION_NONE);
+	}
+
+	public function GetBufferTimeNone()
+	{
+		return $this->GetCheckbox(FormKeys::BUFFER_TIME_NONE);
+	}
+
+	public function GetStartNoticeNoneAdd()
+	{
+		return $this->GetCheckbox(FormKeys::MIN_NOTICE_NONE_ADD);
+	}
+
+	public function GetStartNoticeNoneUpdate()
+	{
+		return $this->GetCheckbox(FormKeys::MIN_NOTICE_NONE_UPDATE);
+	}
+
+	public function GetStartNoticeNoneDelete()
+	{
+		return $this->GetCheckbox(FormKeys::MIN_NOTICE_NONE_UPDATE);
+	}
+
+	public function GetEndNoticeNone()
+	{
+		return $this->GetCheckbox(FormKeys::MAX_NOTICE_NONE);
+	}
+
+	/**
+	 * @param BookableResource $resource
+	 */
+	public function BindUpdatedDuration($resource)
+	{
+		$this->Set('resource', $resource);
+		$this->Display('Admin/Resources/manage_resources_duration.tpl');
+	}
+
+	/**
+	 * @param BookableResource $resource
+	 */
+	public function BindUpdatedCapacity($resource)
+	{
+		$this->Set('resource', $resource);
+		$this->Display('Admin/Resources/manage_resources_capacity.tpl');
+	}
+
+	/**
+	 * @param BookableResource $resource
+	 */
+	public function BindUpdatedAccess($resource)
+	{
+		$this->Set('resource', $resource);
+		$this->Display('Admin/Resources/manage_resources_access.tpl');
+	}
+
+	/**
+	 * @param BookableResource $resource
+	 * @param ResourceGroup[] $groupList
+	 */
+	public function BindUpdatedResourceGroups($resource, $groupList)
+	{
+		$this->Set('resource', $resource);
+		$this->Set('ResourceGroupList', $groupList);
+		$this->Display('Admin/Resources/manage_resources_groups.tpl');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetAttributeId()
+	{
+		return $this->GetQuerystring(QueryStringKeys::ATTRIBUTE_ID);
+	}
+
+	public function SetAttributeValueAsJson($attributeValue)
+	{
+		$this->SetJson($attributeValue);
+	}
+
+	public function GetPermissionUserId()
+	{
+		return $this->GetForm(FormKeys::USER_ID);
+	}
+
+	public function GetPermissionGroupId()
+	{
+		return $this->GetForm(FormKeys::GROUP_ID);
+	}
+
+	public function GetPermissionType()
+	{
+		return $this->GetForm(FormKeys::PERMISSION_TYPE);
+	}
+
+	/**
+	 * @param ResourceGroupTree $resourceGroups
+	 */
+	public function BindResourceGroups(ResourceGroupTree $resourceGroups)
+	{
+		$this->Set('ResourceGroups', json_encode($resourceGroups->GetGroups(false)));
+		$groupList = $resourceGroups->GetGroupList(false);
+		$this->Set('ResourceGroupList', $groupList);
+	}
+
+	public function GetResourceGroupIds()
+	{
+		$groupIds = $this->GetForm(FormKeys::GROUP_ID);
+		if (empty($groupIds))
+		{
+			return array();
+		}
+
+		return $groupIds;
+	}
+
+	public function GetColor()
+	{
+		return $this->GetForm(FormKeys::RESERVATION_COLOR);
+	}
+
+	public function GetEnableCheckin()
+	{
+		return $this->GetCheckbox(FormKeys::ENABLE_CHECK_IN);
+	}
+
+	public function GetBulkEnableCheckin()
+	{
+		return $this->GetForm(FormKeys::ENABLE_CHECK_IN);
+	}
+
+	public function GetAutoReleaseMinutes()
+	{
+		return $this->GetForm(FormKeys::AUTO_RELEASE_MINUTES);
+	}
+
+	public function GetCredits()
+	{
+		return $this->GetForm(FormKeys::CREDITS);
+	}
+
+	public function GetPeakCredits()
+	{
+		return $this->GetForm(FormKeys::PEAK_CREDITS);
+	}
+
+	public function BindUpdatedResourceCredits(BookableResource $resource)
+	{
+		$this->Set('resource', $resource);
+		$this->Display('Admin/Resources/manage_resources_credits.tpl');
+	}
+
+	public function ShowQRCode($qrCodeImageUrl, $resourceName)
+	{
+		$this->Set('QRImageUrl', $qrCodeImageUrl);
+		$this->Set('ResourceName', $resourceName);
+
+		$this->Display('Admin/Resources/show_resource_qr.tpl');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetBulkAllowMultiday()
+	{
+		return $this->GetForm(FormKeys::ALLOW_MULTIDAY);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetBulkRequiresApproval()
+	{
+		return $this->GetForm(FormKeys::REQUIRES_APPROVAL);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetBulkAutoAssign()
+	{
+		return $this->GetForm(FormKeys::AUTO_ASSIGN);
+	}
+
+	public function GetImportFile()
+	{
+		return $this->server->GetFile(FormKeys::RESOURCE_IMPORT_FILE);
+	}
+
+	public function ShowTemplateCSV($attributes)
+	{
+		$this->Set('attributes', $attributes);
+		$this->DisplayCsv('Admin/Resources/import_resource_template_csv.tpl', 'resources.csv');
+	}
+
+	public function SetImportResult($importResult)
+	{
+		$this->SetJsonResponse($importResult);
+	}
+
+	public function ShowExportCsv()
+	{
+		$this->DisplayCsv('Admin/Resources/resources_csv.tpl', 'resources.csv');
+	}
+
+	public function GetMaxParticipantsUnlimited()
+	{
+		return $this->GetCheckbox(FormKeys::MAX_PARTICIPANTS_UNLIMITED);
+	}
+
+	public function GetUpdateOnImport()
+	{
+		return $this->GetCheckbox(FormKeys::UPDATE_ON_IMPORT);
+	}
+
+	public function BindResourceImages(BookableResource $resource)
+	{
+		$response = array('image' => null, 'images' => array());
+
+		if ($resource->HasImage())
+		{
+			$response = array('image' => $this->smarty->GetResourceImage(array('image' => $resource->GetImage()), $this->smarty), 'images' => array());
+		}
+		foreach ($resource->GetImages() as $image)
+		{
+			$response['images'][] = $this->smarty->GetResourceImage(array('image' => $image), $this->smarty);
+		}
+		$this->SetJsonResponse($response);
+	}
+
+	public function GetImageName()
+	{
+		return $this->GetForm(FormKeys::RESOURCE_IMAGE);
+	}
+
+	public function BindGroupPermissions($groups)
+	{
+		$this->Set('Groups', $groups);
+		$this->Display('Admin/Resources/manage_resources_group_permissions.tpl');
+	}
+
+	public function BindUserPermissions($users)
+	{
+		$this->Set('Users', $users);
+		$this->Display('Admin/Resources/manage_resources_user_permissions.tpl');
+	}
+
+	public function DisplayPublicSettings($resource)
+	{
+		$this->Set('resource', $resource);
+		$this->Display('Admin/Resources/manage_resources_public.tpl');
+	}
 
 	public function GetAllowConcurrentReservations()
 	{
@@ -1143,140 +1166,173 @@ public function GetMaxConcurrentReservations()
 		return intval($val);
 	}
 
-    public function GetBulkAllowConcurrentReservations()
-    {
-        return $this->GetForm(FormKeys::ALLOW_CONCURRENT_RESERVATIONS);
-    }
+	public function GetBulkAllowConcurrentReservations()
+	{
+		return $this->GetForm(FormKeys::ALLOW_CONCURRENT_RESERVATIONS);
+	}
+
+	public function SendStatusChangeMessage()
+	{
+		return $this->GetCheckbox(FormKeys::SEND_AS_EMAIL);
+	}
+
+	public function StatusChangeDays()
+	{
+		return $this->GetForm(FormKeys::DAY);
+	}
+
+	public function GetStatusChangeMessage()
+	{
+		return $this->GetForm(FormKeys::EMAIL_CONTENTS);
+	}
 }
 
 class ResourceFilterValues
 {
-    public $ResourceNameFilter;
-    public $ScheduleIdFilter;
-    public $ResourceTypeFilter;
-    public $ResourceStatusFilterId;
-    public $ResourceStatusReasonFilterId;
-    public $CapacityFilter;
-    public $RequiresApprovalFilter;
-    public $AutoPermissionFilter;
-    public $AllowMultiDayFilter;
-    public $Attributes = array();
-
-    /**
-     * @param AttributeFormElement[] $attributeFormElements
-     */
-    public function SetAttributes($attributeFormElements)
-    {
-        foreach ($attributeFormElements as $e) {
-            $this->SetAttributeValue($e->Id, $e->Value);
-        }
-    }
-
-    public function SetAttributeValue($id, $value)
-    {
-        $this->Attributes[$id] = $value;
-    }
-
-    public function GetAttributeValue($id)
-    {
-        if (array_key_exists($id, $this->Attributes)) {
-            return $this->Attributes[$id];
-        }
-
-        return null;
-    }
-
-    /**
-     * @param CustomAttribute[] $customAttributes
-     * @return ISqlFilter
-     */
-    public function AsFilter($customAttributes)
-    {
-        $filter = new SqlFilterNull();
-        if (!empty($this->ResourceNameFilter)) {
-            $filter->_And(new SqlFilterLike(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
-                ColumnNames::RESOURCE_NAME),
-                $this->ResourceNameFilter));
-        }
-        if (!empty($this->ScheduleIdFilter)) {
-            $filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
-                ColumnNames::SCHEDULE_ID), $this->ScheduleIdFilter));
-        }
-        if (!empty($this->ResourceTypeFilter)) {
-            $filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
-                ColumnNames::RESOURCE_TYPE_ID),
-                $this->ResourceTypeFilter));
-        }
-        if ($this->ResourceStatusFilterId != '') {
-            $filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
-                ColumnNames::RESOURCE_STATUS_ID),
-                $this->ResourceStatusFilterId));
-        }
-        if ($this->ResourceStatusReasonFilterId != '') {
-            $filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
-                ColumnNames::RESOURCE_STATUS_REASON_ID),
-                $this->ResourceStatusReasonFilterId));
-        }
-        if (!empty($this->CapacityFilter)) {
-            $filter->_And(new SqlFilterGreaterThan(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
-                ColumnNames::RESOURCE_MAX_PARTICIPANTS),
-                $this->CapacityFilter, true));
-        }
-        if ($this->RequiresApprovalFilter != '') {
-            $filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
-                ColumnNames::RESOURCE_REQUIRES_APPROVAL),
-                $this->RequiresApprovalFilter));
-        }
-        if ($this->AutoPermissionFilter != '') {
-            $filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
-                ColumnNames::RESOURCE_AUTOASSIGN),
-                $this->AutoPermissionFilter));
-        }
-        if ($this->AllowMultiDayFilter != '') {
-            $filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
-                ColumnNames::RESOURCE_ALLOW_MULTIDAY),
-                $this->AllowMultiDayFilter));
-        }
-
-        if (!empty($this->Attributes)) {
-            $filteringAttributes = false;
-            $attributeDefinitions = array();
-            foreach ($customAttributes as $a) {
-                $attributeDefinitions[$a->Id()] = $a;
-            }
-
-            $f = new SqlFilterFreeForm('`' . ColumnNames::RESOURCE_ID . '` IN (SELECT `a0`.`' . ColumnNames::ATTRIBUTE_ENTITY_ID . '` FROM `' . TableNames::CUSTOM_ATTRIBUTE_VALUES . '` `a0` ');
-
-            $attributeFragment = new SqlFilterNull();
-
-            /** @var $attribute Attribute */
-            foreach ($this->Attributes as $id => $value) {
-                if ($value == null || $value == '' || !array_key_exists($id, $attributeDefinitions)) {
-                    continue;
-                }
-                $filteringAttributes = true;
-                $attribute = $attributeDefinitions[$id];
-                $attributeId = new SqlRepeatingFilterColumn("a$id", ColumnNames::CUSTOM_ATTRIBUTE_ID, $id);
-                $attributeValue = new SqlRepeatingFilterColumn("a$id", ColumnNames::CUSTOM_ATTRIBUTE_VALUE, $id);
-
-                $idEquals = new SqlFilterEquals($attributeId, $id);
-                $f->AppendSql('LEFT JOIN `' . TableNames::CUSTOM_ATTRIBUTE_VALUES . '` `a`' . $id . ' ON `a0`.`entity_id` = `a' . $id . '`.`entity_id` ');
-                if ($attribute->Type() == CustomAttributeTypes::MULTI_LINE_TEXTBOX || $attribute->Type() == CustomAttributeTypes::SINGLE_LINE_TEXTBOX) {
-                    $attributeFragment->_And($idEquals->_And(new SqlFilterLike($attributeValue, $value)));
-                }
-                else {
-                    $attributeFragment->_And($idEquals->_And(new SqlFilterEquals($attributeValue, $value)));
-                }
-            }
-
-            $f->AppendSql("WHERE [attribute_list_token] )");
-            $f->Substitute('attribute_list_token', $attributeFragment);
-
-            if ($filteringAttributes) {
-                $filter->_And($f);
-            }
-        }
-
-        return $filter;
-    }
+	public $ResourceNameFilter;
+	public $ScheduleIdFilter;
+	public $ResourceTypeFilter;
+	public $ResourceStatusFilterId;
+	public $ResourceStatusReasonFilterId;
+	public $CapacityFilter;
+	public $RequiresApprovalFilter;
+	public $AutoPermissionFilter;
+	public $AllowMultiDayFilter;
+	public $Attributes = array();
+
+	/**
+	 * @param AttributeFormElement[] $attributeFormElements
+	 */
+	public function SetAttributes($attributeFormElements)
+	{
+		foreach ($attributeFormElements as $e)
+		{
+			$this->SetAttributeValue($e->Id, $e->Value);
+		}
+	}
+
+	public function SetAttributeValue($id, $value)
+	{
+		$this->Attributes[$id] = $value;
+	}
+
+	public function GetAttributeValue($id)
+	{
+		if (array_key_exists($id, $this->Attributes))
+		{
+			return $this->Attributes[$id];
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param CustomAttribute[] $customAttributes
+	 * @return ISqlFilter
+	 */
+	public function AsFilter($customAttributes)
+	{
+		$filter = new SqlFilterNull();
+		if (!empty($this->ResourceNameFilter))
+		{
+			$filter->_And(new SqlFilterLike(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
+																ColumnNames::RESOURCE_NAME),
+											$this->ResourceNameFilter));
+		}
+		if (!empty($this->ScheduleIdFilter))
+		{
+			$filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
+																  ColumnNames::SCHEDULE_ID), $this->ScheduleIdFilter));
+		}
+		if (!empty($this->ResourceTypeFilter))
+		{
+			$filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
+																  ColumnNames::RESOURCE_TYPE_ID),
+											  $this->ResourceTypeFilter));
+		}
+		if ($this->ResourceStatusFilterId != '')
+		{
+			$filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
+																  ColumnNames::RESOURCE_STATUS_ID),
+											  $this->ResourceStatusFilterId));
+		}
+		if ($this->ResourceStatusReasonFilterId != '')
+		{
+			$filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
+																  ColumnNames::RESOURCE_STATUS_REASON_ID),
+											  $this->ResourceStatusReasonFilterId));
+		}
+		if (!empty($this->CapacityFilter))
+		{
+			$filter->_And(new SqlFilterGreaterThan(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
+																	   ColumnNames::RESOURCE_MAX_PARTICIPANTS),
+												   $this->CapacityFilter, true));
+		}
+		if ($this->RequiresApprovalFilter != '')
+		{
+			$filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
+																  ColumnNames::RESOURCE_REQUIRES_APPROVAL),
+											  $this->RequiresApprovalFilter));
+		}
+		if ($this->AutoPermissionFilter != '')
+		{
+			$filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
+																  ColumnNames::RESOURCE_AUTOASSIGN),
+											  $this->AutoPermissionFilter));
+		}
+		if ($this->AllowMultiDayFilter != '')
+		{
+			$filter->_And(new SqlFilterEquals(new SqlFilterColumn(TableNames::RESOURCES_ALIAS,
+																  ColumnNames::RESOURCE_ALLOW_MULTIDAY),
+											  $this->AllowMultiDayFilter));
+		}
+
+		if (!empty($this->Attributes))
+		{
+			$filteringAttributes = false;
+			$attributeDefinitions = array();
+			foreach ($customAttributes as $a)
+			{
+				$attributeDefinitions[$a->Id()] = $a;
+			}
+
+			$f = new SqlFilterFreeForm('`' . ColumnNames::RESOURCE_ID . '` IN (SELECT `a0`.`' . ColumnNames::ATTRIBUTE_ENTITY_ID . '` FROM `' . TableNames::CUSTOM_ATTRIBUTE_VALUES . '` `a0` ');
+
+			$attributeFragment = new SqlFilterNull();
+
+			/** @var $attribute Attribute */
+			foreach ($this->Attributes as $id => $value)
+			{
+				if ($value == null || $value == '' || !array_key_exists($id, $attributeDefinitions))
+				{
+					continue;
+				}
+				$filteringAttributes = true;
+				$attribute = $attributeDefinitions[$id];
+				$attributeId = new SqlRepeatingFilterColumn("a$id", ColumnNames::CUSTOM_ATTRIBUTE_ID, $id);
+				$attributeValue = new SqlRepeatingFilterColumn("a$id", ColumnNames::CUSTOM_ATTRIBUTE_VALUE, $id);
+
+				$idEquals = new SqlFilterEquals($attributeId, $id);
+				$f->AppendSql('LEFT JOIN `' . TableNames::CUSTOM_ATTRIBUTE_VALUES . '` `a`' . $id . ' ON `a0`.`entity_id` = `a' . $id . '`.`entity_id` ');
+				if ($attribute->Type() == CustomAttributeTypes::MULTI_LINE_TEXTBOX || $attribute->Type() == CustomAttributeTypes::SINGLE_LINE_TEXTBOX)
+				{
+					$attributeFragment->_And($idEquals->_And(new SqlFilterLike($attributeValue, $value)));
+				}
+				else
+				{
+					$attributeFragment->_And($idEquals->_And(new SqlFilterEquals($attributeValue, $value)));
+				}
+			}
+
+			$f->AppendSql("WHERE [attribute_list_token] )");
+			$f->Substitute('attribute_list_token', $attributeFragment);
+
+			if ($filteringAttributes)
+			{
+				$filter->_And($f);
+			}
+		}
+
+		return $filter;
+	}
 }
\ No newline at end of file
diff --git a/Pages/Admin/ResourceAdminManageResourcesPage.php b/Pages/Admin/ResourceAdminManageResourcesPage.php
index 30e198cd6..2bf0b4d35 100644
--- a/Pages/Admin/ResourceAdminManageResourcesPage.php
+++ b/Pages/Admin/ResourceAdminManageResourcesPage.php
@@ -1,21 +1,21 @@
 <?php
 /**
-Copyright 2012-2020 Nick Korbel
-
-This file is part of Booked Scheduler.
-
-Booked Scheduler is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Booked Scheduler is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Booked Scheduler.  If not, see <http://www.gnu.org/licenses/>.
+ * Copyright 2012-2020 Nick Korbel
+ *
+ * This file is part of Booked Scheduler.
+ *
+ * Booked Scheduler is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Booked Scheduler is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Booked Scheduler.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 require_once(ROOT_DIR . 'Pages/Admin/ManageResourcesPage.php');
@@ -29,13 +29,14 @@ public function __construct()
 	{
 		parent::__construct();
 		$this->presenter = new ManageResourcesPresenter(
-										$this,
-										new ResourceAdminResourceRepository(new UserRepository(), ServiceLocator::GetServer()->GetUserSession()),
-										new ScheduleRepository(),
-										new ImageFactory(),
-										new GroupRepository(),
-										new AttributeService(new AttributeRepository()),
-										new UserPreferenceRepository()
-										);
+				$this,
+				new ResourceAdminResourceRepository(new UserRepository(), ServiceLocator::GetServer()->GetUserSession()),
+				new ScheduleRepository(),
+				new ImageFactory(),
+				new GroupRepository(),
+				new AttributeService(new AttributeRepository()),
+				new UserPreferenceRepository(),
+				new ReservationViewRepository()
+		);
 	}
 }
\ No newline at end of file
diff --git a/Presenters/Admin/ManageResourcesPresenter.php b/Presenters/Admin/ManageResourcesPresenter.php
index 3025519ce..2626eae0f 100644
--- a/Presenters/Admin/ManageResourcesPresenter.php
+++ b/Presenters/Admin/ManageResourcesPresenter.php
@@ -25,6 +25,7 @@
 require_once(ROOT_DIR . 'lib/Application/Admin/ImageUploadDirectory.php');
 require_once(ROOT_DIR . 'lib/Application/Admin/ResourceImportCsv.php');
 require_once(ROOT_DIR . 'lib/Application/Admin/CsvImportResult.php');
+require_once(ROOT_DIR . 'lib/Email/Messages/ResourceStatusChangeEmail.php');
 
 class ManageResourcesActions
 {
@@ -98,6 +99,11 @@ class ManageResourcesPresenter extends ActionPresenter
 	 */
 	private $userPreferenceRepository;
 
+	/**
+	 * @var IReservationViewRepository
+	 */
+	private $reservationViewRepository;
+
 	public function __construct(
 			IManageResourcesPage $page,
 			IResourceRepository $resourceRepository,
@@ -105,7 +111,8 @@ public function __construct(
 			IImageFactory $imageFactory,
 			IGroupViewRepository $groupRepository,
 			IAttributeService $attributeService,
-			IUserPreferenceRepository $userPreferenceRepository)
+			IUserPreferenceRepository $userPreferenceRepository,
+			IReservationViewRepository $reservationViewRepository)
 	{
 		parent::__construct($page);
 
@@ -116,6 +123,7 @@ public function __construct(
 		$this->groupRepository = $groupRepository;
 		$this->attributeService = $attributeService;
 		$this->userPreferenceRepository = $userPreferenceRepository;
+		$this->reservationViewRepository = $reservationViewRepository;
 
 		$this->AddAction(ManageResourcesActions::ActionAdd, 'Add');
 		$this->AddAction(ManageResourcesActions::ActionChangeAdmin, 'ChangeAdmin');
@@ -464,6 +472,28 @@ public function ChangeStatus()
 
 		$resource->ChangeStatus($statusId, $statusReasonId);
 		$this->resourceRepository->Update($resource);
+
+		if ($this->page->SendStatusChangeMessage())
+		{
+
+			$emails = array();
+			$days = intval($this->page->StatusChangeDays());
+			$days = max(1, min($days, 365));
+			$message = $this->page->GetStatusChangeMessage();
+
+			Log::Debug("Sending resource status changed email to users. Days: %s", $days);
+
+			$reservations = $this->reservationViewRepository->GetReservations(Date::Now(), Date::Now()->AddDays($days), null, null, null, $resourceId);
+
+			foreach ($reservations as $reservation) {
+				$email = $reservation->OwnerEmailAddress;
+				if (!array_key_exists($email, $emails)) {
+					$emails[$email] = 1;
+					ServiceLocator::GetEmailService()->Send(new ResourceStatusChangeEmail($email, $resource, $message, $reservation->OwnerLanguage));
+				}
+
+			}
+		}
 	}
 
 	public function ChangeSchedule()
diff --git a/Web/css/admin.css b/Web/css/admin.css
index 20339d5c5..1358b9829 100644
--- a/Web/css/admin.css
+++ b/Web/css/admin.css
@@ -466,6 +466,11 @@ td.update {
 #resource-images .resource-image img {
   width: 100%;
 }
+#sendStatusChangeMessageContent {
+  background-color: #f0f0f0;
+  border: solid 1px #999;
+  padding: 1em;
+}
 .admin-page input,
 #page-manage-blackouts input,
 #page-manage-reservations input,
diff --git a/Web/css/booked.css b/Web/css/booked.css
index ad04c5d47..3008c480c 100644
--- a/Web/css/booked.css
+++ b/Web/css/booked.css
@@ -2421,6 +2421,14 @@ td.update {
 #resource-images .resource-image img {
   width: 100%;
 }
+#sendStatusChangeMessageContent {
+  background-color: #fcfcfc;
+  border: solid 1px #ccc;
+  padding: 1em;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+}
 .admin-page input,
 #page-manage-blackouts input,
 #page-manage-reservations input,
diff --git a/Web/css/less/admin.less b/Web/css/less/admin.less
index df711f5be..6db003f9d 100644
--- a/Web/css/less/admin.less
+++ b/Web/css/less/admin.less
@@ -574,6 +574,13 @@ td.update {
   }
 }
 
+#sendStatusChangeMessageContent {
+  background-color: #fcfcfc;
+  border: solid 1px #ccc;
+  padding: 1em;
+  .rounded();
+}
+
 /// page level overrides
 
 .admin-page, #page-manage-blackouts, #page-manage-reservations, #page-manage-resources, #page-manage-users, #page-manage-quotas {
diff --git a/Web/scripts/admin/resource.js b/Web/scripts/admin/resource.js
index 979474968..b4099ca7e 100644
--- a/Web/scripts/admin/resource.js
+++ b/Web/scripts/admin/resource.js
@@ -102,6 +102,10 @@ function ResourceManagement(opts) {
 		checkAllowConcurrent: $('#allowConcurrentChk'),
 		maxConcurrent: $('#maxConcurrentReservations'),
 		allowConcurrentDiv: $('#allowConcurrentDiv'),
+
+		toggleStatusChangeMessage: $('#toggleStatusChangeMessage'),
+		sendStatusChangeMessageContent: $('#sendStatusChangeMessageContent'),
+		statusMessageContent: $('#statusMessageContent'),
 	};
 
 	var resources = {};
@@ -322,17 +326,17 @@ function ResourceManagement(opts) {
 			}
 		});
 
-        $('#bulkEditConcurrent').change(function () {
-            if ($(this).val() == '1')
-            {
-                $('#bulkEditAllowConcurrentDiv').removeClass('no-show');
-            }
+		$('#bulkEditConcurrent').change(function () {
+			if ($(this).val() == '1')
+			{
+				$('#bulkEditAllowConcurrentDiv').removeClass('no-show');
+			}
 
-            if ($(this).val() == '0')
-            {
-                $('#bulkEditAllowConcurrentDiv').addClass('no-show');
-            }
-        });
+			if ($(this).val() == '0')
+			{
+				$('#bulkEditAllowConcurrentDiv').addClass('no-show');
+			}
+		});
 
 		elements.bulkUpdatePromptButton.click(function (e) {
 			e.preventDefault();
@@ -460,6 +464,18 @@ function ResourceManagement(opts) {
 			window.location.reload();
 		});
 
+
+		elements.toggleStatusChangeMessage.on('change', function (e) {
+			if ($(this).is(":checked"))
+			{
+				elements.sendStatusChangeMessageContent.removeClass('no-show');
+			}
+			else
+			{
+				elements.sendStatusChangeMessageContent.addClass('no-show');
+			}
+		});
+
 		var imageSaveErrorHandler = function (result) {
 			alert(result);
 		};
@@ -532,6 +548,7 @@ function ResourceManagement(opts) {
 		ConfigureAsyncForm(elements.copyForm, defaultSubmitCallback(elements.copyForm));
 		ConfigureAsyncForm(elements.importForm, defaultSubmitCallback(elements.importForm), importHandler);
 		ConfigureAsyncForm(elements.bulkDeleteForm, defaultSubmitCallback(elements.bulkDeleteForm));
+		ConfigureAsyncForm(elements.statusForm, defaultSubmitCallback(elements.statusForm));
 	};
 
 	ResourceManagement.prototype.add = function (resource) {
@@ -813,12 +830,12 @@ function ResourceManagement(opts) {
 
 	var showStatusPrompt = function (e) {
 		var resource = getActiveResource();
-		var statusForm = $('.popover:visible').find('form');
+		var statusForm = elements.statusForm;
 
 		var statusOptions = statusForm.find(elements.statusOptions);
 		var statusReasons = statusForm.find(elements.statusReasons);
 		var addStatusReason = statusForm.find(elements.addStatusReason);
-		var saveButton = statusForm.find('.save');
+		// var saveButton = statusForm.find('.save');
 
 		statusOptions.val(resource.statusId);
 		statusReasons.val(resource.reasonId);
@@ -849,14 +866,20 @@ function ResourceManagement(opts) {
 			}
 		});
 
-		saveButton.unbind();
+		// saveButton.unbind();
+		//
+		//
+		//
+		// saveButton.click(function () {
+		// 	statusForm.submit();
+		// });
+		//
 
-		ConfigureAsyncForm(statusForm, defaultSubmitCallback(statusForm));
-
-		saveButton.click(function () {
-			statusForm.submit();
-		});
+		elements.toggleStatusChangeMessage.prop('checked', false);
+		elements.sendStatusChangeMessageContent.addClass('no-show');
+		elements.statusMessageContent.val('');
 
+		elements.statusDialog.modal('show');
 		statusOptions.focus();
 	};
 
diff --git a/build.xml b/build.xml
index 59dc817d1..ff28fd3c2 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <project name="booked" default="package">
-    <property name="version" value="2.8.4"/>
+    <property name="version" value="2.8.5"/>
     <property name="is.pre.release" value="false"/>
     <property name="packagename" value="booked-${version}"/>
     <property name="root.dir" value="../.."/>
diff --git a/lang/en_us.php b/lang/en_us.php
index 20b9d7bd0..b77f0725e 100755
--- a/lang/en_us.php
+++ b/lang/en_us.php
@@ -796,6 +796,10 @@ protected function _LoadStrings()
         $strings['ResourceDisplayInstructions'] = 'No resource has been selected. You can find the URL to display a resource in Application Management, Resources. The resource must be publicly accessible.';
         $strings['Owner'] = 'Owner';
 		$strings['MaximumConcurrentReservations'] = 'Maximum Concurrent Reservations';
+		$strings['NotifyUsers'] = 'Notify Users';
+		$strings['Message'] = 'Message';
+		$strings['AllUsersWhoHaveAReservationInTheNext'] = 'Anyone with a reservation in the next';
+		$strings['ChangeResourceStatus'] = 'Change Resource Status';
         // End Strings
 
 		// Install
@@ -1017,6 +1021,7 @@ protected function _LoadStrings()
 		$strings['ReservationParticipantDecline'] = '%s has declined your reservation invitation for %s on %s';
 		$strings['ReservationParticipantJoin'] = '%s has joined your reservation for %s on %s';
 		$strings['ReservationAvailableSubject'] = '%s is available on %s';
+		$strings['ResourceStatusChangedSubject'] = 'The availability of %s has changed';
 		// End Email Subjects
 
 		$this->Strings = $strings;
diff --git a/lang/en_us/ResourceStatusChanged.tpl b/lang/en_us/ResourceStatusChanged.tpl
new file mode 100644
index 000000000..ae754bab8
--- /dev/null
+++ b/lang/en_us/ResourceStatusChanged.tpl
@@ -0,0 +1,23 @@
+{*
+Copyright 2011-2020 Nick Korbel
+
+This file is part of Booked Scheduler.
+
+Booked Scheduler is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Booked Scheduler is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Booked Scheduler.  If not, see <http://www.gnu.org/licenses/>.
+*}
+<p>You are receiving this message because you have an upcoming reservation on {$ResourceName} and its availability has changed.</p>
+
+<p>{$Message|nl2br}</p>
+
+<p><a href="{$ScriptUrl}">Log in to {$AppTitle}</a></p>
diff --git a/lib/Application/Authentication/CaptchaService.php b/lib/Application/Authentication/CaptchaService.php
index f04e74992..70d7d3fba 100644
--- a/lib/Application/Authentication/CaptchaService.php
+++ b/lib/Application/Authentication/CaptchaService.php
@@ -91,10 +91,10 @@ public static function Create()
 														 new BooleanConverter())
 			)
 			{
-				Log::Debug('Using ReCaptchaService');
+//				Log::Debug('Using ReCaptchaService');
 				return new ReCaptchaService();
 			}
-			Log::Debug('Using CaptchaService');
+//			Log::Debug('Using CaptchaService');
 			return new CaptchaService();
 		}
 
diff --git a/lib/Config/Configuration.php b/lib/Config/Configuration.php
index fa29efce7..d94d9d38a 100644
--- a/lib/Config/Configuration.php
+++ b/lib/Config/Configuration.php
@@ -99,7 +99,7 @@ class Configuration implements IConfiguration
     const DEFAULT_CONFIG_ID = 'booked';
     const DEFAULT_CONFIG_FILE_PATH = 'config/config.php';
 
-    const VERSION = '2.8.4';
+    const VERSION = '2.8.5';
 
     protected function __construct()
     {
diff --git a/lib/Email/Messages/ResourceStatusChangeEmail.php b/lib/Email/Messages/ResourceStatusChangeEmail.php
new file mode 100644
index 000000000..6d94a6ee9
--- /dev/null
+++ b/lib/Email/Messages/ResourceStatusChangeEmail.php
@@ -0,0 +1,59 @@
+<?php
+/**
+Copyright 2012-2020 Nick Korbel
+
+This file is part of Booked Scheduler is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Booked Scheduler.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+require_once(ROOT_DIR . 'lib/Email/namespace.php');
+
+class ResourceStatusChangeEmail extends EmailMessage
+{
+
+	private $email;
+	/**
+	 * @var BookableResource
+	 */
+	private $resource;
+	private $message;
+
+	/**
+	 * @param string $email
+	 * @param BookableResource $resource
+	 * @param string $message
+	 * @param string $language
+	 */
+	public function __construct($email, BookableResource $resource, $message, $language)
+	{
+		parent::__construct($language);
+		$this->email = $email;
+		$this->resource = $resource;
+		$this->message = $message;
+	}
+
+	public function To()
+	{
+		return new EmailAddress($this->email);
+	}
+
+	public function Subject()
+	{
+		return $this->Translate('ResourceStatusChangedSubject', array($this->resource->GetName()));
+	}
+
+	public function Body()
+	{
+		$this->Set('ResourceName', $this->resource->GetName());
+		$this->Set('Message', $this->message);
+		return $this->FetchTemplate('ResourceStatusChanged.tpl');
+	}
+}
\ No newline at end of file
diff --git a/tpl/Admin/Resources/manage_resources.tpl b/tpl/Admin/Resources/manage_resources.tpl
index 2441c9fe7..ad3bb3e49 100644
--- a/tpl/Admin/Resources/manage_resources.tpl
+++ b/tpl/Admin/Resources/manage_resources.tpl
@@ -227,17 +227,17 @@ along with Booked Scheduler.  If not, see <http://www.gnu.org/licenses/>.
                                 {if $resource->IsAvailable()}
                                     {html_image src="status.png"}
 									<a class="update changeStatus"
-									   href="#" rel="popover"
+									   href="#"
 									   data-popover-content="#statusDialog">{translate key='Available'}</a>
                                 {elseif $resource->IsUnavailable()}
                                     {html_image src="status-away.png"}
 									<a class="update changeStatus"
-									   href="#" rel="popover"
+									   href="#"
 									   data-popover-content="#statusDialog">{translate key='Unavailable'}</a>
                                 {else}
                                     {html_image src="status-busy.png"}
 									<a class="update changeStatus"
-									   href="#" rel="popover"
+									   href="#"
 									   data-popover-content="#statusDialog">{translate key='Hidden'}</a>
                                 {/if}
                                 {if array_key_exists($resource->GetStatusReasonId(),$StatusReasons)}
@@ -508,7 +508,8 @@ along with Booked Scheduler.  If not, see <http://www.gnu.org/licenses/>.
 							<label for="resourceAdminGroupId">{translate key='ResourceAdministrator'}</label>
 							<select class="form-control" {formname key=RESOURCE_ADMIN_GROUP_ID}
 									id="resourceAdminGroupId">
-								{if $CanViewAdmin}<option value="">{translate key=None}</option>{/if}
+                                {if $CanViewAdmin}
+									<option value="">{translate key=None}</option>{/if}
                                 {foreach from=$AdminGroups item=adminGroup}
 									<option value="{$adminGroup->Id}">{$adminGroup->Name}</option>
                                 {/foreach}
@@ -925,51 +926,77 @@ along with Booked Scheduler.  If not, see <http://www.gnu.org/licenses/>.
 		</form>
 	</div>
 
-	<div id="statusDialog" class="hide">
-		<form class="statusForm" method="post" ajaxAction="{ManageResourcesActions::ActionChangeStatus}">
-			<div class="control-group form-group">
-				<div class="form-group">
-					<label>{translate key=Status}
-						<select {formname key=RESOURCE_STATUS_ID} class="statusId form-control">
-							<option value="{ResourceStatus::AVAILABLE}">{translate key=Available}</option>
-							<option value="{ResourceStatus::UNAVAILABLE}">{translate key=Unavailable}</option>
-							<option value="{ResourceStatus::HIDDEN}">{translate key=Hidden}</option>
-						</select>
-					</label>
-				</div>
+	<div id="statusDialog" class="modal" tabindex="-1" role="dialog" aria-labelledby="statusModalLabel"
+		 aria-hidden="true">
+		<form id="statusForm" method="post" role="form" ajaxAction="{ManageResourcesActions::ActionChangeStatus}">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+						<h4 class="modal-title" id="statusModalLabel">{translate key=ChangeResourceStatus}</h4>
+					</div>
+					<div class="modal-body">
+						<div class="control-group form-group">
+							<div class="form-group">
+								<label>{translate key=Status}
+									<select {formname key=RESOURCE_STATUS_ID} class="statusId form-control">
+										<option value="{ResourceStatus::AVAILABLE}">{translate key=Available}</option>
+										<option value="{ResourceStatus::UNAVAILABLE}">{translate key=Unavailable}</option>
+										<option value="{ResourceStatus::HIDDEN}">{translate key=Hidden}</option>
+									</select>
+								</label>
+							</div>
+
+							<div class="form-group no-show newStatusReason">
+								<label>{translate key=ReasonText}
+									<a href="#" class="pull-right addStatusReason">
+										<span class="no-show">{translate key=ReasonText}</span>
+										<span class="addStatusIcon fa fa-list-alt icon add"></span>
+									</a>
+									<input type="text"
+										   class="form-control resourceStatusReason" {formname key=RESOURCE_STATUS_REASON} />
+								</label>
+							</div>
+							<div class="form-group existingStatusReason">
+								<label>
+                                    {translate key=Reason}
+									<a href="#" class="pull-right addStatusReason">
+										<span class="no-show">{translate key=Reason}</span>
+										<span class="addStatusIcon fa fa-plus icon add"></span>
+									</a>
+									<select {formname key=RESOURCE_STATUS_REASON_ID} class="form-control reasonId"></select>
+								</label>
+							</div>
 
-				<div class="form-group no-show newStatusReason">
-					<label>{translate key=ReasonText}
-						<a href="#" class="pull-right addStatusReason">
-							<span class="no-show">{translate key=ReasonText}</span>
-							<span class="addStatusIcon fa fa-list-alt icon add"></span>
-						</a>
-						<input type="text"
-							   class="form-control resourceStatusReason" {formname key=RESOURCE_STATUS_REASON} />
-					</label>
-				</div>
-				<div class="form-group existingStatusReason">
-					<label>
-                        {translate key=Reason}
-						<a href="#" class="pull-right addStatusReason">
-							<span class="no-show">{translate key=Reason}</span>
-							<span class="addStatusIcon fa fa-plus icon add"></span>
-						</a>
-						<select {formname key=RESOURCE_STATUS_REASON_ID} class="form-control reasonId"></select>
-					</label>
-				</div>
+							<div class="form-group">
+								<div class="checkbox">
+									<input type="checkbox" id="toggleStatusChangeMessage" {formname key=SEND_AS_EMAIL}/>
+									<label for="toggleStatusChangeMessage">{translate key=NotifyUsers}</label>
+								</div>
+							</div>
 
-			</div>
-			<div class="editable-buttons">
-				<button type="button" class="btn btn-primary btn-sm editable-submit save">
-					<span class="no-show">{translate key=Save}</span>
-					<i class="glyphicon glyphicon-ok"></i>
-				</button>
-				<button type="button" class="btn btn-default btn-sm editable-cancel">
-					<span class="no-show">{translate key=Cancel}</span>
-					<i class="glyphicon glyphicon-remove"></i>
-				</button>
-                {indicator}
+							<div id="sendStatusChangeMessageContent" class="no-show">
+								<div class="form-group">
+									<label for="statusMessageSendDays">{translate key=AllUsersWhoHaveAReservationInTheNext}</label>
+									<div class="input-group">
+										<input type="number" min="1" max="365" step="1" value="30" id="statusMessageSendDays" class="form-control" {formname key=DAY}/>
+										<div class="input-group-addon">{translate key=days}</div>
+									</div>
+								</div>
+
+								<div class="form-group">
+									<label for="statusMessageContent">{translate key=Message}</label>
+									<textarea id="statusMessageContent" class="form-control" {formname key=EMAIL_CONTENTS}></textarea>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="modal-footer">
+                        {cancel_button}
+                        {update_button}
+                        {indicator}
+					</div>
+				</div>
 			</div>
 		</form>
 	</div>
@@ -1350,20 +1377,20 @@ along with Booked Scheduler.  If not, see <http://www.gnu.org/licenses/>.
 							</div>
 						</div>
 
-                        <div class="form-group">
-                            <label for="bulkEditConcurrent" class="control-label">{translate key=AllowConcurrentReservations}</label>
-                            <select id="bulkEditConcurrent" class="form-control" {formname key=ALLOW_CONCURRENT_RESERVATIONS}>
+						<div class="form-group">
+							<label for="bulkEditConcurrent" class="control-label">{translate key=AllowConcurrentReservations}</label>
+							<select id="bulkEditConcurrent" class="form-control" {formname key=ALLOW_CONCURRENT_RESERVATIONS}>
                                 {html_options options=$YesNoUnchangedOptions}
-                            </select>
-                            <div class="no-show" id="bulkEditAllowConcurrentDiv">
+							</select>
+							<div class="no-show" id="bulkEditAllowConcurrentDiv">
                                 {capture name="txtConcurrentReservations" assign="txtConcurrentReservations"}
-                                    <label for='bulkEditMaxConcurrentReservations' class='no-show'>Maximum Concurrent Reservations</label>
-                                    <input type='number' max='99' min='2' id='bulkEditMaxConcurrentReservations'
-                                           class='form-control inline minutes' {formname key=MAX_CONCURRENT_RESERVATIONS} value='2' />
+									<label for='bulkEditMaxConcurrentReservations' class='no-show'>Maximum Concurrent Reservations</label>
+									<input type='number' max='99' min='2' id='bulkEditMaxConcurrentReservations'
+										   class='form-control inline minutes' {formname key=MAX_CONCURRENT_RESERVATIONS} value='2'/>
                                 {/capture}
                                 {translate key='ResourceConcurrentReservations' args=$txtConcurrentReservations}
-                            </div>
-                        </div>
+							</div>
+						</div>
 
 						<div class="form-group">
 							<label for="bulkEditAllowSubscriptions"