Don't fold group name in with child package names

Author: baffles

codepulse/src/main/resources/toserve/pages/traces/PackageController.js

@@ -72,11 +72,14 @@
 					if(node.isSelfNode){
 						pw.fullLabel(node.name).abbreviatedLabel(node.name)
 					} else {
-						var parentName = packageParentNode ? packageParentNode.name : '',
-							abbrevName = node.name.substr(parentName.length)
+						var abbrevName
 
 						if (packageParentNode && packageParentNode.kind == 'group')
-							abbrevName = abbrevName.substr(1)
+							abbrevName = node.name
+						else {
+							var parentName = packageParentNode ? packageParentNode.name : '',
+								abbrevName = node.name.substr(parentName.length)
+						}
 
 						pw.fullLabel(node.name).abbreviatedLabel(abbrevName)
 					}

codepulse/src/main/scala/com/secdec/codepulse/data/bytecode/CodeForestBuilder.scala

@@ -109,7 +109,10 @@ class CodeForestBuilder(defaultTracedGroups: List[String]) {
 	}
 
 	protected def addChildPackage(parent: CodeTreeNode, name: String) = {
-		val pkgName = parent.name + '.' + name
+		val pkgName = parent.kind match {
+			case CodeTreeNodeKind.Grp => name
+			case _ => parent.name + '.' + name
+		}
 		parent.findChild { node =>
 			node.name == pkgName && node.kind == CodeTreeNodeKind.Pkg
 		} getOrElse {