Merge branch 'master' into Dustin
Merge branch 'master' into Dustin
show and hide services bottom bar
Merge branch 'Dustin'