[Updated] Client Version
Merge branch 'feature/CRCs' into develop

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
[Add] Mocks for login
[Add] Multi's
[Update] Character Select screen comes up
[Add] Other Servers
[Update] Handlers for each server
[Add] Combined Data packets
[Update] Login
[Update] Zone
Merge branch 'feature/PacketCombine' into develop
[Update] Refactor
Merge remote-tracking branch 'origin/develop' into feature/AuthServ

Conflicts:
	conf/log4j.properties
	gameserver/com/ocdsoft/gameserver/routes/impl/SOEMessageRouter.java
	gameserver/com/ocdsoft/gameserver/servers/auth/AuthServer.java
	gameserver/com/ocdsoft/gameserver/servers/auth/AuthServer.properties
	pom.xml