Added new level of inheritance between player/npcs and creatures, started work on new NPC class.
Merge branch 'creature-rework' of https://github.com/CleverRaven/Cataclysm-DDA into creature-rework
Added constructor definitions to nonplayer.cpp
all combat except disarm should work
Merge branch 'creature-rework' of github.com:CleverRaven/Cataclysm-DDA into creature-rework

Conflicts:
	src/player.cpp
	src/player.h