Merge pull request #14 from fusijie/master

merge with wuhao.
Merge branch 'master' of https://github.com/Wu-Hao/TankMultiplayer

Conflicts:
	proj.ios_mac/TankMultiplayer.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/Wu-Hao/TankMultiplayer

Conflicts:
	Classes/Hero.cpp
	Classes/Hero.h