merge
merge
Merge branch 'master' of https://github.com/AbstractShanxy/AbstractBugs

Conflicts:
	src/Entity.h
empty doc