Added some junk
Merge branch 'master' of github.com:Aslai/Coldstormd

Conflicts:
	daemon/src/coldstormd/callbacks.cpp
Added some small things