Merge Dev_2 into Dev_1

Conflicts:
	src/Client/Client.java
Merge Dev_2 into Dev_1
ON THE EDGE!