Start replacing bottom nav-bar w/static one.
Merge branch 'master' into replace-bottom-nav-bar
Replace bottom nav-bar with simple footer.
Style: Convert tabs to spaces.