Slightly lowered some constraint priorities to keep autolayout from complaining about    "UIView-Encapsulated-Layout-Height"
Merge remote-tracking branch 'origin/master'