Resolved conflict with std::abs in msvc2013.
possibly related to PR#7275
Resolving Merge conflicts
Merge extraction of turns and message metods from game object.

Conflicts:
	src/action.cpp
	src/game.cpp
	src/monattack.cpp
	src/npcmove.cpp
Astyle messages module.