cleanup..
Merge branch 'master' of https://github.com/akshayrd/Snowbattle_github_new

Conflicts:
	SnowBattle/tags/SnowBattle_working/cocos2dsimplegame/BonusStage.h
	SnowBattle/tags/SnowBattle_working/cocos2dsimplegame/BonusStage.m