Created by: RobertBlackhart
Merge changes into dev branch that were just merged from mobilelayout into master.