Putting topbar back
t pushMerge branch 'develop' of github.com:filitchp/spiritedrobotics into develop