Merge remote-tracking branch 'origin/dev' into 173-syncing-to-pod-files-syncing

# Conflicts:
#	lib/MemriApp/Controllers/API/Authentication.dart
#	lib/MemriApp/Controllers/AppController.dart
#	lib/MemriApp/Controllers/Database/DatabaseQuery.g.dart

3 jobs for 173-syncing-to-pod-files-syncing in 3 minutes and 12 seconds (queued for 1 second)

2fba63ab