Merge pull request #23 from miguelmig/master

Add CHARACTER::GetEmpire() missing implementation (#12)
Add CItem::GetVnum()'s missing implementation
Merge pull request #24 from miguelmig/upstream

Add CItem::GetVnum()'s missing implementation
CItem Attribute getter (#12)
CItem Attribute getter (#12)
Fixed CItem::GetVnum
Merge remote-tracking branch 'upstream/master'

Conflicts:
	game/CItem.cpp

Conflicts:
	game/CItem.cpp