reorganied into general entities
Merge branch 'master' of https://github.com/Siine/GatherCommon

Conflicts:
	src/com/gather/common/dataobjects/EntityType.java