Cosmetic
Merge remote-tracking branch 'origin/master'
Begin tinkering with Home screen buttons auto-layout