quadtree
Merge branch 'master' of https://github.com/acmercyj/Fighter into develop_lyx
no message
Merge branch 'master' of https://github.com/acmercyj/Fighter

Conflicts:
	Classes/layer/fighter.cpp
	Classes/obj/hero.cpp