Fixed string sending from C#
Merge remote-tracking branch 'origin/master'

Conflicts:
	Flare-JLib/src/FlareJLib/network/packets/PacketTestMode.java
	Flare-Server/out/production/FlareJLib/FlareJLib/network/customStream/DataInputStreamUT.class
	Flare-Server/out/production/FlareServer/FlareServer/IO/ServerPacketHandler.class
	Flare-Server/serverconfig.xml

Fixed some conflicts