거의 다 옮겨감
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Server/Server.vcxproj
	src/Server/Server.vcxproj.filters