Merge branch 'bugfix' of erinn/bounce into master

main.go

@@ -168,9 +168,13 @@ func loadCwtchData(gcd *gothings.GrandCentralDispatcher) {
 		group.NewMessage = make(chan model.Message)
 		go characters.CwtchListener(gcd.UIState.AddMessage, groups[i], group.NewMessage)
 		the.Peer.JoinServer(group.GroupServer)
+		nick, exists := group.GetAttribute("nick")
+		if !exists {
+			nick = group.GroupID[:12]
+		}
 		gcd.UIState.AddContact(&gobjects.Contact{
 			group.GroupID,
-			group.GroupID[:12],
+			nick,
 			cwutil.RandomGroupImage(group.GroupID),
 			group.GroupServer,
 			0,