addHud
Merge branch 'OrdineStyleCollision' of https://github.com/LuizFernandoCirigliano/TwoAndAHalfGame into OrdineStyleCollision

Conflicts:
	Server/testCocos/Game.h
	Server/testCocos/Game.m