Merge pull request #860 from corinnecurcie/stable

Hoping to help dev server with testimonial pages...
changing toolbar so Waku shows up first time after signing in