prep for joining tab
Merge branch 'master' of https://github.com/colonialclub/colonial-appengine
Merge branch 'master' of https://github.com/colonialclub/colonial-appengine
added joining content and html