Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

src/services/SkillService.java

@@ -399,6 +399,8 @@ public class SkillService implements INetworkDispatch {
 	public void resetExpertise(CreatureObject creature) {
 		List<String> skills = new ArrayList<String>(creature.getSkills());
 		skills.stream().filter(s -> s.contains("expertise")).forEach(s -> removeSkill(creature, s));
+		
+		creature.getBuffList().stream().forEach(buff -> creature.removeBuff(buff));
 	}
 	
 	public void sendRespecWindow(CreatureObject creature) {

src/services/chat/ChatService.java

@@ -941,6 +941,7 @@ public class ChatService implements INetworkDispatch {
 			}
 			
 			room.addUser(user.toLowerCase());
+			((CreatureObject) player).getPlayerObject().addChannel(roomId);
 			return true;
 		}
 		return false;
@@ -1001,10 +1002,6 @@ public class ChatService implements INetworkDispatch {
 		});
 	}
 	
-	public void handleGroupChat(SWGObject sender, String message) {
-		
-	}
-	
 	public ConcurrentHashMap<Integer, ChatRoom> getChatRooms() {
 		return chatRooms;
 	}