clean up includes
fix some more header problems
Make several member variables of Character private
Merge branch 'master' of https://github.com/shivoc/Illarion-Server into testserver

Conflicts:
	src/Character.cpp
	src/Character.hpp
	src/WorldIMPLAdmin.cpp
Fix player login position