Merge Dev_2 into Dev_1

Conflicts:
	src/Server/Server.java
Merge Dev_2 into Dev_1

Conflicts:
	src/Server/Server.java