Merge remote-tracking branch 'origin/master'

Conflicts:
	Android/bin/Debug/Xalendar.Android-Signed.apk
	Android/bin/Debug/Xalendar.Android.apk
	Android/bin/Debug/Xalendar.Android.dll
	Android/bin/Debug/Xalendar.Android.dll.mdb
	Android/bin/Debug/Xalendar.Android.pdb
	Android/bin/Debug/Xamarin.Forms.Core.xml
	Android/bin/Debug/Xamarin.Forms.Xaml.xml
	Android/obj/Debug/Xalendar.Android.csproj.FileListAbsolute.txt
	Android/obj/Debug/Xalendar.Android.csprojResolveAssemblyReference.cache
	Android/obj/Debug/Xalendar.Android.dll
	Android/obj/Debug/Xalendar.Android.pdb
	Android/obj/Debug/acw-map.txt
	Android/obj/Debug/android/AndroidManifest.xml
	Android/obj/Debug/android/bin/Xalendar.Android.apk
	Android/obj/Debug/android/bin/classes.dex
	Android/obj/Debug/android/bin/classes/xalendar/android/R$drawable.class
	Android/obj/Debug/android/bin/classes/xalendar/android/R$id.class
	Android/obj/Debug/android/bin/classes/xalendar/android/R$layout.class
	Android/obj/Debug/android/bin/classes/xalendar/android/R$string.class
	Android/obj/Debug/android/bin/classes/xalendar/android/R.class
	Android/obj/Debug/android/bin/packaged_resources
	Android/obj/Debug/android/bin/resources_and_assemblies
	Android/obj/Debug/android/src/android/support/v13/R.java
	Android/obj/Debug/android/src/android/support/v4/R.java
	Android/obj/Debug/android/src/mono/MonoPackageManager.java

	Android/obj/Debug/android/src/mono/android/support/v4/app/FragmentManager_OnBackStackChangedListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/content/Loader_OnLoadCompleteListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/view/ActionProvider_SubUiVisibilityListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/view/ActionProvider_VisibilityListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/view/MenuItemCompat_OnActionExpandListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/view/OnApplyWindowInsetsListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/view/ViewPager_OnPageChangeListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/view/ViewPropertyAnimatorListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/view/ViewPropertyAnimatorUpdateListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/widget/DrawerLayout_DrawerListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/widget/SlidingPaneLayout_PanelSlideListenerImplementor.java

	Android/obj/Debug/android/src/mono/android/support/v4/widget/SwipeRefreshLayout_OnRefreshListenerImplementor.java
	Android/obj/Debug/android/src/xalendar/NotificationAlert_Android.java
	Android/obj/Debug/android/src/xalendar/TextToSpeech_Android.java
	Android/obj/Debug/android/src/xalendar/android/AlarmReceiver.java
	Android/obj/Debug/android/src/xalendar/android/MainActivity.java
	Android/obj/Debug/android/src/xalendar/android/R.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ActionSheetRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ActivityIndicatorRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/AndroidActivity.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/BaseCellView.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/BoxRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ButtonDrawable.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ButtonRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ButtonRenderer_ButtonClickListener.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/CarouselPageAdapter.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/CarouselPageRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/CellAdapter.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/CellRenderer_RendererHolder.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/DatePickerRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/DatePickerRenderer_TextFieldClickHandler.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/EditorEditText.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/EditorRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/EntryCellEditText.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/EntryCellView.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/EntryEditText.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/EntryRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/FormattedStringExtensions_FontSpan.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/FormsApplicationActivity.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/FormsImageView.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/FormsTextView.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/FrameRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/FrameRenderer_FrameDrawable.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/GenericAnimatorListener.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/GenericMenuClickListener.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ImageRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/LabelRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ListViewAdapter.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ListViewRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/MasterDetailContainer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/MasterDetailRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/NavigationMenuRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/NavigationMenuRenderer_MenuAdapter.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/NavigationMenuRenderer_MenuElementView.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/NavigationRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ObjectJavaBox_1.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/OpenGLRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/OpenGLRenderer_Renderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/PageContainer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/PageRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/PickerRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/PickerRenderer_PickerListener.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/PlatformRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ProgressBarRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/RendererFactory_DefaultRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ScrollViewContainer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ScrollViewRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/SearchBarRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/SliderRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/StepperRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/StepperRenderer_StepperListener.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/SwitchCellView.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/SwitchRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/TabbedRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/TableViewModelRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/TableViewRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/TextCellRenderer_TextCellView.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/TimePickerRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/TimePickerRenderer_TimePickerListener.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ToolbarRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ViewCellRenderer_ViewCellContainer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ViewRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/ViewRenderer_2.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/VisualElementRenderer_1.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/VisualElementTracker_AttachTracker.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/WebViewRenderer.java

	Android/obj/Debug/android/src/xamarin/forms/platform/android/WebViewRenderer_WebClient.java
	Android/obj/Debug/assemblies/FormsViewGroup.dll
	Android/obj/Debug/assemblies/Xalendar.Android.dll
	Android/obj/Debug/assemblies/Xalendar.Android.dll.mdb
	Android/obj/Debug/assemblies/Xamarin.Forms.Platform.Android.dll
	Android/obj/Debug/resolved_assemblies.txt
	Android/obj/Debug/uploadflags.txt

	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/MonoAndroid10/Xamarin.Forms.Core.xml

	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/MonoAndroid10/Xamarin.Forms.Xaml.xml

	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/MonoTouch10/Xamarin.Forms.Core.xml

	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/MonoTouch10/Xamarin.Forms.Xaml.xml
	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/WP80/Xamarin.Forms.Core.xml
	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/WP80/Xamarin.Forms.Xaml.xml

	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/Xamarin.iOS10/Xamarin.Forms.Core.xml

	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/Xamarin.iOS10/Xamarin.Forms.Xaml.xml

	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Core.xml

	packages/Xamarin.Forms.1.3.0.6286-pre4/lib/portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10/Xamarin.Forms.Xaml.xml