Make it compile on Visual Studio 2013
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/citizen.cpp
	src/entity.cpp
fix build post-merge
Merge branch 'winmaster'