Merge branch 'master' into hendrik-testing

website/public/profile.php

@@ -42,12 +42,11 @@ function nicetime($date) {
 }
 
 if(empty($_GET["username"])) {
-    echo "User does not exist!";
-    return;
+    $userID = $_SESSION["userID"];
+} else {
+    $userID = getUserID($_GET["username"]);
 }
 
-$userID = getUserID($_GET["username"]);
-
 $user = selectUser($userID);
 $profile_friends = selectAllFriends($userID);
 $profile_groups = selectAllUserGroups($userID);

website/public/styles/menu.css

@@ -30,7 +30,7 @@
     cursor: pointer;
 }
 
-.friend-item:hover {
+.friend-item:hover, .group-item:hover {
     background: #845663;
     color: white;
 }