Merge origin/master

Conflicts:
	src/goldencage/GoldenCage.java
Merge origin/master

Conflicts:
	src/goldencage/GoldenCage.java
Merge origin/master

Conflicts:
	src/goldencage/GoldenCage.java
Merge pull request #3 from GoldenDevs/ElyesBranch