back button and join button fix
Merge branch 'master' of https://github.com/kevinhamiltonsmith/breaking-trail