Merge branch 'ui' into 'charts'

# Conflicts:
#   lib/MemriApp/Controllers/Database/PropertyDatabaseValue.dart
3 jobs for charts in 2 minutes and 21 seconds (queued for 1 second)