unit parsing with combat stats
Merge branch 'player' of https://github.com/GL-MPRI-2014/GL_MPRI_2014 into player

Conflicts:
	src/common/Unit.ml