Merge branch 'master' of https://github.com/yaodd/MMFIighting

Signed-off-by: yaodd <yaodunding2006@163.com>
Merge branch 'master' of https://github.com/yaodd/MMFIighting

Conflicts:
	MMFighting/Classes/AppDelegate.cpp
	MMFighting/GameOverLayer.cpp
	MMFighting/MMFightingAllImage.plist
	MMFighting/MMFightingAllImage.pvr.ccz

Signed-off-by: yaodd <yaodunding2006@163.com>