Merge origin/master

Conflicts:
	src/QD/goldencage/Beans/Client.java
Merge origin/master

Conflicts:
	src/QD/goldencage/Beans/Client.java
Merge origin/master

Conflicts:
	src/QD/goldencage/Beans/Client.java