ааа
Merge remote-tracking branch 'origin/qt5.3-port' into qt5.3-port

Conflicts:
	server/Creature.hpp
	server/Monster.hpp
	server/Player.cpp
	server/Player.hpp