Merge remote-tracking branch 'origin/feature/assistant-endpoints' into feature/assistant-endpoints

# Conflicts:
#	library/src/main/java/com/owncloud/android/lib/resources/assistant/model/TaskList.kt
#	library/src/main/java/com/owncloud/android/lib/resources/assistant/model/TaskTypes.kt