Merge Dev_3 into Dev_1

Conflicts:
	src/Shared/Message.java
	src/Shared/msgObjects/userData.java
Merge Dev_2 into Dev_1

Conflicts:
	src/Client/Client.java
STANDING!