ChatUser
Merge remote-tracking branch 'origin/Chat' into ChatMark3

Conflicts:
	src/co/sblock/Sblock/UserData/SblockUser.java
Merge remote-tracking branch 'origin/ChatMark3' into ChatMark3

Conflicts:
	src/co/sblock/Sblock/Chat2/ChatUser.java