Merge branch 'develop'

# Conflicts:
#	Notesmaster/.idea/deploymentTargetSelector.xml
#	Notesmaster/.idea/gradle.xml
#	Notesmaster/app/build.gradle.kts
#	Notesmaster/app/src/main/AndroidManifest.xml
#	Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java
#	Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java
#	Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java
#	Notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java
#	Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
#	Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java
#	Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java
#	Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java
#	Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java
#	Notesmaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java
#	Notesmaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java
#	Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
#	Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
#	Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java
#	Notesmaster/app/src/main/res/layout/note_edit.xml
#	Notesmaster/app/src/main/res/values/colors.xml
#	Notesmaster/app/src/main/res/values/strings.xml
#	Notesmaster/gradle/wrapper/gradle-wrapper.properties

Notesmaster/.idea/gradle.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>