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

Conflicts:

SnowBattle/trunk/SnowBattle_working/cocos2dsimplegame.xcodeproj/project.
pbxproj
	SnowBattle/trunk/SnowBattle_working/cocos2dsimplegame/GameStartLayer.m
check commit