modifying to fix testing issues
modifying to fix testing issues
Merge origin/master
removed problematic tests.
removed problematic tests.
Merge origin/master

Conflicts:
	tests/server/ServerGUITest.java
	tests/server/SlashCommandTest.java
	tests/server/TeamDataTest.java
	tests/server/TeamTest.java
	tests/server/UserCallableTest.java
	tests/server/UserDataTest.java
	tests/server/UserTest.java