Merge branch 'dev' into 'UIList'

# Conflicts:
#   Podfile
#   memri/control/Application.swift
1 job for UIList