Getting up-to-date
Finalised merge with twostars/snoxd-koserver, both branches are now in sync
Merge git://github.com/twostars/snoxd-koserver
Merge git://github.com/twostars/snoxd-koserver
Merge git://github.com/twostars/snoxd-koserver
Merge git://github.com/twostars/snoxd-koserver
Merge git://github.com/twostars/snoxd-koserver
Few user variables
Few additions to the merchant system.
Merge git://github.com/twostars/snoxd-koserver
Twostars' work, might need to reverse because of overwriting his commits
Merge 16-02-2013 20:12
PM's now work again, Merchants showing up from the start

And removed a return statement (which was out of place, as far as I
could tell)
MerchantHandler now using some global vars and fixed AllKnightsList()

Should however log the USKO / EUKO packet for this as this is plain
ugly, and unlogical
Merge git://github.com/twostars/snoxd-koserver

Conflicts:
	Ebenezer/AttackHandler.cpp
	shared/database/OdbcCommand.cpp
Fixing up some things, move along people.
Merge branch 'master' of https://github.com/maxmenten/snoxd-koserver