Merge remote-tracking branch 'origin/PRS-SITE-PUBLISHING-BRANCH-ONLY' into frank

# Conflicts:
#	prs.mobile.new/PRS.Mobile.Droid/Properties/AndroidManifest.xml

prs.mobile.new/PRS.Mobile.Droid/Properties/AndroidManifest.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest 
-		xmlns:android="http://schemas.android.com/apk/res/android" 
-		android:versionCode="102200" 
-		android:versionName="1.02.2" 
-		package="comal.timesheets.Android">
-	<uses-sdk 
-			android:minSdkVersion="29" 
-			android:targetSdkVersion="33" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="102120" android:versionName="1.02.12" package="comal.timesheets.Android">
+	<uses-sdk android:minSdkVersion="29" android:targetSdkVersion="33" />
 	<queries>
 		<intent>
 			<action android:name="android.media.action.IMAGE_CAPTURE" />
@@ -37,9 +31,7 @@
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.CAMERA" />
-	<application 
-			android:label="PRS Site App" 
-			android:icon="@drawable/puzzle">
+	<application android:label="PRS Site App">
 		<provider android:name="android.support.v4.content.FileProvider" android:authorities="${applicationId}.fileprovider" android:exported="false" android:grantUriPermissions="true">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"></meta-data>
 		</provider>

prs.mobile.new/PRS.Mobile.Droid/Resources/Resource.designer.cs

@@ -15,7 +15,7 @@ namespace PRS.Mobile.Droid
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
 	public partial class Resource
 	{
 		

prs.mobile.new/PRS.Mobile.iOS/Info.plist

@@ -27,7 +27,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.prsdigital.prssiteapp</string>
 	<key>CFBundleVersion</key>
-	<string>1.02.8</string>
+	<string>1.02.12</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>CFBundleName</key>

prs.mobile.new/PRS.Mobile/Components/DigitalForms/Editor/QAFormViewer.cs

@@ -612,7 +612,7 @@ namespace PRS.Mobile
             string value = "";
             DFLayoutDateField dfLayoutDateField = element as DFLayoutDateField;
             DatePicker item = new DatePicker();
-            item.Format = "dd MMM yyyy";
+            item.Format = "dd-MM-yyyy";
             if (dfLayoutDateField.Properties.Required)
                 item.BackgroundColor = isRequiredColor;
             item.HorizontalOptions = LayoutOptions.CenterAndExpand;
@@ -620,7 +620,11 @@ namespace PRS.Mobile
             {
                 if (!string.IsNullOrWhiteSpace(value))
                 {
-                    item.Date = DateTime.Parse(value);
+                    try
+                    {
+                        item.Date = DateTime.Parse(value);
+                    }
+                    catch { }
                 }
             }
             if (loadRetainedForm)