sync
sync
fix merge conflict
Tweaks for mobile
Merge remote-tracking branch 'origin/jeff' into chris
Background fixed on mobile